sry to hear that sheldon! but its a common problem, you should be back to normal soon!
mine was doing the same about one year ago, during steep uphills only the temp rise instantly (done it twice), but i found out that the fan didn't came in as the engine creep a bit forward /backward and make the connection of the fan with the coolant temp sensor to become loose, never made it again since then, but from then i always keeps an eye on the water temperature
! but i changed the headgasket too about year ago (to be on d safe side) and changed everything like headbolts, head gskt set, waterpump, coolant, rad cap,thermostat, hoses, cleaned rad but just used the same timing belt (as it was only 15000km old). so you should re-use the waterpump, timing belt etc without any problems