I would expect the heater to stop working if the head gasket went, certainly on my old Citroen that was the case.
Were it not for the other symptoms I'd suggest a problem with the seal on the header tank cap, I had that after replacing the tank last year (original split). However, with the other problems this sounds like the gasket.