Depending upon many things a prop in the 20-23P could work. What RPMs are you turning at WOT. Is a water pressure gauge hooked up? Lots of questions to be answered before you can be helped a lot.
I'll need to get these answers. My tac is not working right now.