If stepping up to a 17" pitch didn't drop the rpms at least 400 rpms. You need more prop pitch yet. Try a 19 but you may need a 21.

Now top speed is not just a function of what prop you install,...