Since you already have the 25M, I suggest having it worked by our BBC prop guy, Mark Croxton. We need to know more info on your current setup.

WOT rpms
gps speed
jackplate setback and propshaft height
holeshot rpm and time