Hi Jamie,
Do you get any heat from the cars heater?
If not, it sounds like it could just be an air lock from what you've said, try bleeding the water system.
After bleeding the system, assuming your water levels are all topped up you should be able to tell if it's your water pump.
Warm (idle) the car up slightly and check your expansion bottle (the coolent bottle) is water being pumped back into the bottle from the top (small) pipe? If you need to remove the cap to check this go careful, obviously the water will start getting hot! If yes, then your water is circulating and it's not the water pump.
I doubt it's the thermostat. If it is these are cheap and easy enough to fit.
Goodluck, Regards
Dean
November 2006