Mk2 Golf engine woes.

Today my beloved Mk2 decided it'd be a good idea to kill its bottom end, so now I need, pretty quickly, to find either a very good 1.8 8v or a decent 2.0 8v short engine.

Anyone know where I might find a decent 2.0 8v short motor?

Oh, would I be right in thinking it's the "ABB" engine code I'm after if I'm using the PB head?

Info would be more than lovely.

Oh, as a secondary thing, my A6 V6 TDI (99 T reg) appears to have had all its power stolen by the air mass fairy. I could do with a cheap and quick way of fixing that while I'm at it.

Ta muchly.