You're doing the best thing you can right now - documenting everything. At this point, in my book, the damage needs to be fixed properly and permanently, PLUS he should re-imburse you for all the charges you've incurred during the time you've been delayed.

Builder-dude is a trainwreck.