Swapping props isn't that simple. The airplane I encountered yesterday has gear that limits the fan size. I suggested to the owner and his mechanic that they bend new gear for the airplane for two reasons. Both reasons seemed equally important to me. The 3blade issue prop sucks on that engine. And two blades on that airplane won't improve over the issue prop unless they're larger diameter. And that's going to take appreciably taller gear. Mains and nose gear. And the mains definitely need 15-20degrees of aft rake.

With your altitude, I'd suggest one thing right up front. YOU are really going to need fan size. We could only get an extra inch on our prop over the issue one. We're on grass, but it's manicured. But even off the paved runway I fly sometimes, I doubt very strongly that the sucker would take the next size up from our inch increase. Because we don't usually have available props in half inch increments. And since you're probably going to benefit most from a bigger prop while other places might get by with just an inch bigger, I'd suggest you definitely bend new mains and look for a taller nose strut.

But take my advice with some reservation. It's often very simple in our hobby to try out something first before going the next step. We did just that yesterday. We tried the next diameter prop larger than the issue prop. It cut some grass, but did improve things measurably. So you can try that too.

But if it were mine, I'd have bent some new gear last night.