hi..might be worth a ring Airbag Man - Vehicle Accident Repair & Automotive Diagnostics i know they are not near you but might be able to advise or know of someone in your area who can help you...not used them myself but know somebody who was helped by them...the waterleak problem is most proberly the drain pipe on the scuttle panel you have to take off the plastic panel where the wipers are and clean out the drain tube most likely clogged up with leaves or something...chris