yes the 17" 4 blade will be a good one to try. Might also get some stern lift and lower planning speed.
In my experience what you give up in tops speed with a 4 blade is more than worth it for what improvements you get over the rpm range where you use your boat most often. Either way I would...