My Peugeot 406 2.1 TD is boiling?

R reg 406 2.1
Original fault: Wednesday in town the car overheated for my wife and coolant poured out on the floor. Not stuck in traffic, no real reason to overheat. She even noticed it was getting warm so put the heater on - happened in McDonalds drive-thru !!!
Got the car recovered home, found bottom hose had blown off so replaced o-ring and refitted hose. Filled with water ran car up for an hour fan cutting in and out as it should... all good - temp under control.
Decided not to use car until I'd replaced water with antifreeze so yesterday I drained system again and replaced with antifreeze, all bled through following Mr Haynes instruction, however on testing, the temp guage got to 90 - no fan cutting in and car boiled again, this time blowing top hose off and dumping coolant to floor. Any advice would be greatly recieved.

Big Bloke
August 2010