As these sort of threads often don't seem to have a conclusion and just in case anyone might have the same query in the future I thought I'd add the result of my question.
I managed to get a good deal on a new 21" Suzuki Watergrip prop. So was replacing like with like, just the 2" increase.
I fitted it yesterday and put 100 miles on it today.
The result was exactly what I was looking for, maximum revs are now 5900, so no more hitting the rev limiter. Top speed with 3/4 fuel and one big bloke onboard has gone up to 41 knots. A lighter load should give a knot or two more I think. The previous top speed was with less fuel on board.
Acceleration is still rapid, so no problems there. Fuel consumption has improved by roughly 10%. Not massive, but every little bit helps. Cruising in the low to mid twenties is as predicted, at a few hundred revs lower, obviously helping the lower fuel consumption. At 5 knots the fuel saving seems to be even greater.
What did come as a pleasant surprise was it now stays on the plane better at lower speeds. Before if I was cruising at 16 or 17 knots, it wouldn't take much of a wave to knock the speed off and to find myself dropping back to 12 to 14 knots and needing to add some revs to get back up to speed. That seems to not be happening so often now.
All in all, I'm really pleased with the result.
__________________
|