How are you determining the RPM? Via the engine panel tach? If so, then before you do anything else--and especially before you start throwing any significant money at the problem--get yourself one of these:
http://www.harborfreight.com/digital-photo-sensor-tachometer-66632.html
The tach on my Yanmar 1GM is off by a good 250 RPM or more on the upper range. Using the optical tach you can make yourself a "deviation table" to note the actual RPM vs. what shows on the engine panel tach.
It could be that you are indeed overpropped. But even here, you should get an accurate reading of your RPM so that if you have a shop re-pitch your prop they can have another piece of info that will help them in determining how much pitch to relieve.