What cam do you have now? I think with the big valve head and a catcam you'll be gaining loads.
Newman 272/400 PH3/4. I have Supertech Beehive Valve Springs too so I can run a higher redline, but when it was mapped there was no power above 7200 anyway. 🙁
Sean/CarsOrBikes took my car down to 1320 for me and built my engine, so he will know better than I do.
My charger may not be the best either, it is a Teflon coated but has 130k on it. I do have a 22k mile charger on stand by as well. I went with a 13.2% pulley to reduce heat on track.