Hope you have good luck, just keep this in the back of your head, doing your own R&D, always (100% sure about this) costs about double or in some cases triple of what a known shop would charge to do it right the first time, and timewise things that take 3-5 days normally, can be extended 1-2 years if you do things yourself.
I had a MKIV about 4 months ago of a customer that had a same issue and he was debating a shortblock change, I have completed that in one week exactly, with about 5 hours every day on the car. But I had everything in stock.