Defo check water pump mine failed but took head gasket with it same symptoms as yours motorway speeds cool as a cucumber but as soon as slowed down she started getting hot
Impeller was loose on shaft
Also check drive on power steering pump isn't loose and the thermostat is fitted correct dog...