I spent part of today working on the layout. There may be just enough room for the new boards, with new holes to mount the larger output board. But it's wide, leaving room for caps that are no more than 1.5" diameter. (Hence the larger chassis, for up to 2.5" beer cans.) Anyhow, this is all preliminary and subject to change.
Personally, I would start with bypassing both the output caps and the last cap in the power supply - bypass caps can be smaller, and I think the PSU cap is equally important.
Stock layout is looking very similar - I don't want to stray too far from an already very successful design. The new cathode resistors (if you don't get the Speedball) are going to be big, and hot!
I gotta say, now that I'm digging into it, kudos to PB (Caucasian Blackplate) for a robust and flexible original design!