I've got a 23" CAT with a Traxxas TRX2.5 engine and ended up cutting an X438 2-blade to 36.5 mm. It's still not an easy match if you don't have a free running hull and the right tuned pipe. Power at the upper RPM range is very dependant on having the proper pipe/prop/motor combination.
There are a but only a few manufacturer that offer 3/16 non-cavitating props in the 35mm range. I think that RRR is one of the them.
What hull are you getting?