If your turning 5800 rpm and using a 3 blade, you should try a larger pitch 3 blade first. What is your motor rated for max. rpm's? Try a 24 or 25 pitch 3 blade first, it will give you more bow lift than a 4 blade and depending on how your boat is running, a 4 blade will actually raise your rpm's higher at the same pitch. Remember 3 blades are faster typically with a poorer hole shot. 4 blades are faster out of the hole with a lower top end. But every boat and motor combo is different, so set up accordingly. What is your engine height and water pressure? A jackplate will go a long way in helping you get a few more mph, as well it helps with handling. And on the bay a plate sets your motor farther back and helps with low speed driving in rough water. You should be able to turn a larger prop than that, I am turning a 25 pitch Tempest Plus on my 175 optimax and it is on a 18.5 Ranger.
I forgot too add, if you go down in pitch your rpm's will go up. You want to go up to lower your rpm's.