Yep defo change the bulbs first. I seem to remember I had a similar issue with my old Mk2 Focus, and it was because I'd put the wrong bulb in even though halfords sold it to me as being the correct one!