Prop brands and types should make a difference. I usually stay with same engine brand props, have worked fine for me. Just play with 1-2 next pitch size to be very close to factory wot parameters, that should stop the rev limiter kicking in. Yam has many props to play with...
Happy Boating