At 31mph with the factory 9 7/8 x 11 1/4" prop, it should be right around 6500 RPM. That is not possible with the 25 2 stroke, as the CDI will only allow it to spin 6250 max before it cuts spark. Unless it's got a 12" prop on it, which would put it back down around ~6250, which is quite impressive. Most of them wouldn't pull a 12"
Unless you're running downstream. LOL. My 4 stroke runs 32.3 down river, 28.6 up.
You got a great little motor! Enjoy it. Ain't sold in the states anymore, and Yamaha is beginning to stop supporting them. I'm assuming part of that is due to EPA.