Looking good! You have gotten great advice on the repair of the boat. I noticed one thing about a pic you posted while sailing. It may not be how you normally have the jib, and just the timing of the pic - but, the jib is on the wrong side of the main. It appears to be on the windward side when it should be on the leeward side.
Again, my assumption may be wrong, and I only mention this becasue I was sailing with a first timer last weekend and he sailed most of the day -til I could get to him - to have him make the adjustment.
Have a great time with the boat!!
1984 Hobie 18