Need to replace the water neck on my od. I saw there are two, 1 states for ourselves with trim and has 6 holes, and the other has two and states for non trim. The one on there now which is broken is the 2 bolt, but I do have power trim. It actually looks like when the drive is trimmed up the snout will not clear. Could this be what broke it in the first place? Should I replace with the 6 hole?