If you dont mind doing prop mods yourself just reduce its diam a bit round off the tips more or send it to chris and have him do it.You can also remove some tongue off the prop to allow it to spin easier as it reduces blade area ,Chiris is def the man to ask though so maybe just ask him what he recomends and explain what problems your having now.Mikes idea sounds good too the x470 2 blade was a great prop on my stocker so i would think the extra blade of the 3 blader on your modded motor would work really well.Sounds like your going in the right direction though so just keep playing and trying different props till you find the results you want.
Mart