Re: baja prop swap
Assuming you're turning your current prop on the high side of the recommended rev range (and you should be), try a Turbo 2+2TH, 20 pitch. A lot of us have run this prop successfully on the + or - 20 foot Bajas. You'll lose a mile or two and a hundred rpm on top but every other aspect of performance is a lot better.
Again....this recommendation is assuming you're propped right now. If not then need to address that. Always good to post up rpm and gps speed at WOT with any request for prop info.