...I will probably have to remove the electronics and repair the shielding paint to ensure good contact. This should fix the switches,too.
Adriaan, there are 2 ferrites. One has the pup wires looped around/through. The other has some other wires looped.
I need to source some shielding paint - any recommendations?
Yes, but this is pretty easy, just remember what goes where, take a picture. A little brush-stroke or two of the Stew-Mac black where the pot and switches seat, AND the hole.
In the picture, it looks like the second ferrite bead has your battery leads looped through it. I don't know what that does for cancelling noise, but I doubt if it generates any. My Wire Dunce Hat is a 2XL though.
Stay on it man, that Rogue is going to blow you away.