Propping is trial and error to find the best all around prop.
For starters, try a 22" RX-4 and make sure the motor is mounted higher than most others due to its low water pickups and built-in setback. Many dealers make the mistake of mounting a G2 in the same holes as a motor that it replaced. A water pressure gauge is a good option to have.
"There is never just one thing wrong with a boat";
-- Travis McGee, main character in a book series by John D. McDonald
The factory recommends that a properly trained technician service your Johnson or Evinrude outboard motor. Should you elect to perform repairs yourself, use caution, common sense, and observe safety procedures in the vicinity of flammable liquids, around moving parts, near high-temperature components, and working with electrical or ignition systems.
The information offered here is only general in nature and should not be construed as complete factory approved procedures, techniques, or specifications. Always use the proper service manual for your motor, up-to-date service literature, the correct tools, and have an understanding of how to proceed with troubleshooting and repair methods. If you are unsure or uncomfortable with a procedure, a situation, or a technique, enlist the services of a factory trained technician.