Golf Mk 1 powerplant

hey peeps!!

well i have a mk 1 golf which i wouldn't mind giving a powerplant upgrade too. currently has an audi 1.8 in it which is fun, but i'd like a bit more.

i have considered a turbo diesel 1.6 or the possibility of supercharging a stock motor.

any thoughts on my options?

a friend suggested keeping the 1.8 and just adding performance carbies to it.

my wants are:
- fun amount of power, without going mental.
- reliable
- something that doesn't take 15 + minutes to warm up!!

thanks.

aaron.