Re-propping...recommendations--Calabria Pro V

Here is how I set up my 02 Calabria Pro V, 6.2L engine:

Boat: 3500 lbs
65 gal fuel tank: 520 lbs
Internal Ballast: 700 lbs
Additional Ballast: 1200 lbs

Total Weight: @ 6000 lbs before people and gear and stereo.

My stock prop is an ACME 13 x 17.5, and I am going to change my prop.

My options are a 13.5 x 16 (recommended by a Calabria rep) and a 13.25 x 15.5 (recommended by ACME Props rep). Both are a larger diamater than the stock prop, so I am concerned about the space between the hull and the prop, which ACME suggests should be at least 10% of the prop diamter.

I know both will give me more holeshot power, but which one do you think will be more efficient and not raise my WOT RPMs too much? Will the larger diameter increase the surface area too much and negate the lower pitch?

Thanks for all of your opinions and experiences,
Tim