Ok, update.
I changed the Heater bypass valve and had hot air for a week. But now its back to warm air until the engine gets up to temp - So? I am right in thinking that the heater bypass valve has gone again?! If it was the heater matrix then I wouldn't have any hot air at all right?