I would start out with those and optimize the rest of the package. I would worry about upgrading the heads until after that “ONLY IF THE NEED ARISES”. The rules cap the class with ballast addition at around the 6.90 mark. It would think they would still be adequate for that with 12.5-13:1 and 3070 pounds race weight.