When your grounding scheme by itself is alright, tightening the ground connection(s) and improving the heater lead dress might be of help. Both did help with my build.
Although I still have a low pitch hum which seems to come from the PT since it's already there when the std by switch is still...