If car is losing water it might be an imperfect seal after the head gasket repair. (Everything should have been pressure tested upon completion but any decent garage should have also warned you to keep an eye on your coolant level for a week or so after the repair). Take a look at the oil to see whether it looks just like it does when new or if it's acquired 'mayonnaise' on top (which is a sure sign of a recurrence of the head gasket problem).
However, from personal experience, I know of another simple cause of overheating, which is an intermittently working fan. The good news is that replacement fans are cheap (a tenner from a breaker's yard) and easy to fit. So the next time your temperature gauge starts rising beyond normal, open the bonnet and look to see whether the fan is running.
Chris