Best practice for pre amp rewire, help pls

[evozero]

Hi All,
Can you guys advise me on the best way to rewire my preamp to reduce hum?
I have an ASL 2004dt wave pre amp,and its noisy! I have tried changing the valves, diodes, caps, vol pot and resistors in the signal path, and Diodes in the PSU.
The sound quality has improved but the hum remains. i am currently using an DIY passive pre to drive my wave 8 mono blocks, the hum is so much better but the dynamics have reduced from the phonostage, CD is better.
My plan is to rewire the signal cables and try and organise the grounding to reduce hum. I will shorten the cap leads, they didn't make it any worse when I added them. My long term plan is to build a pre3 and phono3, but want to try and resolve this in the meantime. I have added some photos of the current wiring and would really appreciate your input.
Many thanks
Ian