Nice work mate, I wish I could find the enthusiasm to get mine finished.

Also need to say with reference to your repaired jack points it might pay to put a hole in the bottom to allow any water to drain out, mine were crushed in as well and the inner foot-well above it was rotten and when I Had the floor cut out while doing the repairs I noticed while it was raining that the sunroof drain pipes drain into the inner sill and also run into the jack points and out the large holes.

I have added the pics to show where I mean, and hopefully someone will confirm this before you go drilling a hole in yours.



This is where I noticed the water running out of mine