I know it's hard to get stuff where your at, but for what it's worth...
Probably would be better to keep the diameter and drop the pitch, that would mean getting a 20x8 or so. That way you hold keep more throttle through the entire flight, keeping the motor running a little hotter.