You stated earlier that you were getting 5800 at WOT and trimmed out... If 5500-6000 is max I would say you are either right there or could potentially drop 1 pitch.
Hopefully someone more familiar with the Optimax 90hp will chime in since I dont know what the max RPM target should be for that engine.