I'm relatively new to this site so i've only just discovered this for the first time so I'm lucky that I didn't have to sit through the gaps in work!
I've just read this from start to finish and all I can say is it's great that you're back at it.
Please don't give up on this, it needs to be finished!!
I put an audi 2.0 K-Jet into a MK2 golf once myself and thought that was a lot of work.........................it was a service compared to this!
Keep it up.........