As PD says you shouldn't be doing that many revs so probably want to up the prop pitch.
Why do you think the engine isn't big enough? There is a common mistake at sailing clubs of putting big engines on ribs that spend most of their life at tick over (burning fuel) and are often driven by relatively inexperienced crew (where too many horses is potentially bad). You need to keep in mind the job it is asked to do. Most club ribs would be fine if they could do 25knots lightly loaded. Clubs with big skiffs, fast cats or foiling moths might have different needs. If its your only (or biggest) boat then towing a dozen becalmed oppies back in against a strong tide might be asking a bit much for it too.
2m swell and 2m waves are very different problems. The assault hull doesn't win many fans on here, but its actually designed for the sort of job you are asking it to do (i) used in conditions where sailing dinghies is possible/enjoyable (ii) not jumping waves all day long (iii) using a small engine / fuel efficient design to keep the rest of the cost down.
If its predominantly a coaching, mark laying, type boat I'd say its fine for the job in most environments with most mainstream dinghies. If its primary purpose is a rescue boat then I think the question depends on a whole load of local circumstances (the tides/currents you deal with, the hazards you face, shipping you need to keep the fleet away from, how far from the launch point you sail, the number of rescue (and or coaching) boats in the fleet, the size of your sailing area, etc.) However it wouldn't be unusual to see that sort of arrangement at a council run training centre - which is a good indicator of its suitability rather than being someone's "grant funded toy".