RE: swap prop or replace engine?
I'm going to have to cast my vote for the larger props (11-5, 11-6, et al) on the .40FP as well. A good while back when the FPs were were still fairly new...most of us had a nickname for the FPs. A nickname that can't be repeated here.
Quite by accident we learned that the "<expletive> pathetic" FP engines turned in a much more convincing performance when a LARGER than what was then accepted prop size was used.
Lastly, it's sad to see a good basic engine as the FP vandalized through the use of a fuel containing a feeble, thin synthetic oil with all the lubricating qualities of worn out anti-freeze. Please run some real oil in this engine....while you still can.