360 Advice Needed - Autocross / Street Engine Build

I haven't measured the actual volume of the heads, they are still shipping and are en-route for Tuesday.

A little background, I had the original 318, then built a 360 for it about 18 years ago. Balanced the bottom end, with the KB107's, flat decked the block and put J-heads with 2.02's on top. 340 Intake, 625 carb, etc, all the usual stuff.
It was parked a long time, and just got it back from storage this summer. Well, drove a few times, and tons of white smoke out the back. Cracked in the #4 cylinder wall. :(

In the meantime, I've been autoxing with a focus SVT, then the GTI, and really enjoy that more than straight line. Descided to tear downs the resto build, and modernize it a bunch. Wiring/charging upgrades, manual 16:1 box, stiffer bars, and plan on 13" discs. I want this to keep up with some of the modern cars if possible.