im with kiwirs4t on this one,
for the getting hot thing take it to a radiator specialist, my s1 never got hot but i took my radiator out and got it rodded and they rekon it was 48%blocked, and put a new top tank on too, runs even cooler now,
and take it too a good auto elec too, so many of them are dodgy, look for ones that have been around for years, its a shame your not in my area as i could get it looked at by people you could trust!!
hope you get it sorted man, being a mechanic myself i hate seeing people getting ripped off by others!!!