I would think you should be able to get 40+ with the right prop. Your speeds VS RPM seems awfully low, but I run a 2 stroker on my 23WA and get 42/43 mph trimmed out at WOT.
http://www.rbbi.com/folders/prop/propcalc.htm This will give you a prop calculator site. Maybe that will help.