If you haven't done it yet, I would do a big time cooling system update:
1) All hoses
2) New radiator
3) New water pump
4) New t - stat and t - stat housing
5) New fan clutch
6) New fluids
Then cross the cooling system off as something to worry about and sleep well at night. It's really not a tough job at all, though it can be messy (although it soudns like you already drained the coolant).