Check out Jeff Blosdale Motorsports in Lake Havasu City. He built the last motor for HavasuCig (in his DCB Cat) It was a 510 C.I. 800HP motor. Blosdale gave him a FULL 1yr warranty on the motor, which he does stand by. If you keep the boat out there in Havasu, leave him your garage door opener and he will come get the boat, do maintenence on it, and bring it back!!! If you go out there alot, all you have to do is go down to his shop and let him do any adjusting you need--for free! He is really good and a cool guy. He will even warranty a 1,000HP motor for 1 FULL yr. Don't worry about him wanting to joyride your boat (or anyone else's) he has a 25' Talon with a 1,000HP in it!! I think he charges $150.00 for a tune-up , the usual oil change, drive oil change and making sure the motor is in excellent running condition.