Thanks for the help guys.
I'm vary that it's the waterpump, because either they work or they don't work. It only seems to be overheating when I turn the A/C on.
I'm going to test the radiator cap to see if it has pressure, then replace the t-stat for the hell of it. The Disco has 165k on it, so I might as well replace for peace of mind.
I need to get the death wobble fixed soon also. My remedy for it is either to drive under 60mph, or over 70mph. No wobbles there.