Have you thought about knocking a couple inches pitch outa da old prop? Maybe that will ease the load on the engine a lower rpms and let you get more outa her? Just a thought. I'm not really an engine guy do I'm only throwing darts in the the dark.
Hope whatever you do you can make the best of it. I'm sure you will.
Fair Winds