Few points
1) If you are going to do an engine swap. Surely do it once and get it right?
2) It would be a lot easier to just buy a GTi, you are also then in a better place to upgrade to a bigger engine later. But I understand the attachment.
3) Get your mind sorted with what you want from the engine. Obviously you are changing due to a knackered engine, and if that was the only reason, I would say go 8v. But you then mentioned a bigger engine, so the 16v might be a better stop gap. Also depends on your driving style. A lot of people love the grunt of the 8v, while others enjoy the revvy style of the 16v.
If it's your daily I guess you need a fast turnaround. So that is something else to consider.
Having said all that, if you are relying on a rear end write off, you will probably need to go with whatever comes along haha, if any at all