Boost sounds like the best plan to me. I have a 572 B1 that is pretty much described above and I am not sure that it would meet your goals for your car but it might be close. I would not go to the 604 with the -13 heads, but what do I know I have not made a pass in a year and a half !