Inter 17 is better boat, IMO
But don't worry about righting.
See pic of my boat, an 18 Square (11-foot beam). Get a righting pole (Rick sells or you can fabricate your own) and you should have little to no problem righting. And you can rig a gin pole or get help to raise the mast.
sea ya
tami