It sounds like you have a pretty good shot of fixing the problem with contractor #2!
Fingers are crossed that you get a good round of tropical rain without the wind problems.
$60K for a pond liner, OMG. Glad you didn't need to go that way.
Good luck.
