I have a v8 small block mercruiser with a bravo 2 outdrive. My issue is the water pump that is mounted on the front of the motor is not OEM and is causing problems. A OEM water pump is a serpentine setup so are there any conversion kits available or do I have to part and parcel everything out.