the Revolution 4 comes in even pitch increments as well so 19 or 20 would probably do you fine. If you see Vensura or Offshore used I would try that but be more inclined to try a 21" given the size of your boat.
Since you are currently propped perfect at upper end of range I think you'd find a...