Is your prop Stainless or aluminum? If alum, you'd certainly get some more speed with a SS prop the same pitch. I addeded 4 mph with the switch to SS.
If you go up to a 21p prop, you'll lose rpm and maybe add nothing much to the top end. You're in the "sweet spot" now for rpm, why change? I know, speed!!!!