If this is a 4 stroke WOT should be between 4500-5500 rpm. So 5800 is a bit much, so going to a 21 pitch prop should drop the rpm around 400 rpm's.
That said, are you sure your not over trimming? The manual shows it should be within the limits if you boat weights in around the 1600-2400 pound mark