If you are hitting 6500-7000 rpms (if your tach is accurate) - you'll need to go UP in pitch size... probably to a 16 pitch... that will put you in a nice rpm range.
Here's why I think your tach is incorrect. If you got 24 mph at 6500 rpms with that motor and a 13 pitch prop - you are...