You could also try shielding the pickup routes and control cavity with adhesive copper foil snail tape which you can buy from Bunnings, but make sure that you get continuity with all the pieces of copper foil, the copper foil also needs to be connected to circuit ground to be effective, this is something I need to do with my Gibson USA LP Studio guitar cause it seems to easily pick up RFI from Fluorescent lights.