I decided to do it the "amateur" way for now but left the leads long enough to do it proper when I have the time.
Yes, lots of super-short leads from the output transistors, jacks etc straight to the board. There's quite a lot of spaghetti to untangle someday when I have the time. For now, replacing the 5 leaky caps has made the amp sound much better. I actually really like the distortion on it.