What the hell did you do to that HB to make it do 30K rpm...?! Did you make a new rod for it too?

Anyway, if that engine is putting out the numbers you say it does, then I would look at the wide blade QM40 props from APC for starters... see how the engine does on that...

If you don't find the prop you need in the APC range... you will probably end up making your own, or recarving a bigger prop to the desired shape and size...