Sounds like you are getting good performance out of your 25p prop so that is where I would start. Although a 24p prop might help both hole shot and top end speed as it looks like you are not running close to the motor's red line (6000 rpm on the pro xs) Talk to a shop that will let you test various props on your boat. My buddy spent a couple days up at Shasta working with Phil's Props to find the right prop for his Champion.

Lotta ins, lotta outs, lotta what have-yous