It would seem some porting and flow bench time on the heads, along with the parts changes you are considering would do the trick. Getting the compression up to 10 will also help a lot.