Just put Propeller calculations into Google and you will get lots of sites you can use yourself. You have all the necessary information. Do the sums to get a ball park size and then go to any propeller manufacturer and ask them for a quote - they will advise the recommended size and you will be able to check against your calculation.
Not reaching full revs suggests current prop is too big, probably in diameter if it is the original.