A diverter would help you get on plane much quicker and without all that bow rise. Definitely a good investment. They occasionally come up for sale used, but don't count on getting one for a bargain price. Figure on paying 1/2 to 3/4 the price of a new one.
You should be turning somewhere more in the neighborhood of 4500 rpm. Check the tach to be sure it is accurate. By the way, the max rpm will be dependant on engine power and the size of the impeller, therefore, no firm answer can be given.