i think most early mk1s had the single speed 4 blade fan..the best upgrade you could do, is get the 16v dual fans (both jetta/golf, and passat had duals)or you can modify a mk3 fan setup to work also. you just have to trim a couple inches off the bottom.myself personally, i would use the 2 speed thermo switch, and wire it up to use that. then you can use both speeds of the fan..
...BTW your Bieber avatar is awesome.-Malone