OK, that helps, Joe - thanks for the extra info. You're quite a bit off from your max RPM and with the light load you had you should be able to get a whole lot closer than you are, if not right at 6,100. Either something is wrong with the engine (highly unlikely given you don't seem to have running problems) or you're not trimming up as far as you should or it's the mounting height.
First, try trimming up higher until the prop ventilates and then back down and then trim up again until just before that point.
FYI, I had asked about the "hole" but I don't personally know what hole is correct. I asked that only as it's another variable and one that is good for you to know about to be able to compare to others with similar rigs. You may want to call your dealer and ask them about the hole.
Unless it's a really sloppy/uneven bottom paint job. BP will have a small impact on top end, but even a "decent" job won't cause that much RPM drop.