I decided to sheild the pickups to eliminate more buzz and hum. Here is a photo of one of the pickups with it’s cover removed.
I wrapped each coil with copper foil and replaced the wiring with 2-wire sheilded cable. Connected the shield to the copper foil and ran all the pickup grounds and shields to a common ground on the volume pot. Forgot to take a photo of the completed wiring. Shielding the pickups helpd a lot.