Getting the hump big time now.

Car started overheating in traffic a while back. First the heater matrix blew, got that fixed and then realised that the fan wasn't kicking in so was still overheating. So i fitted a new rad fan & new fan switch.
Tested on Saturday, and fan kicked in as expected, drove car on Sunday with no probs

, but not in traffic.
Drove to work this morning, and fan not kicking in again. Oil temp hitting 122 with water temp just over 1/2 way round. Left for 45 mins after oil buzzer sounded and finished journey. parked up and popped bonnet and fan was whizzing round!
Thinking thermostat / water pump / head gasket problem, but really getting the ar$e now, as have had the car for 3 months now, and only managed about 500 miles.
And last week the drainage holes by the windscreen were well blocked up with old leaves etc, which has got into my interior fan motor, causing some steaming at first and now the fans totally packed in at all speeds.
Any sensible advice / ideas welcome.