You might want to consider a newer ('20+) ZL1 and leave it completely stock. Tinker with your 496 Olds and when it causes a bit of frustration you have a nice 650 HP car to go drive for a nerve calming therapy session. I haven't modded my '15 Z/28 and I have used it in plenty of situations when
my Olds has decided to throw a mechanical temper tantrum.