changing the pump isnt too bad a job. i had mine replaced a couple of months ago. Its located under the belt tensioner on the left of the engine. The only trouble they had replacing mine was that that the old one had welded itself to the block and my m8 said they had to use a pry bar and a sledge hammer to knock it off
But hopefully like you say it mite be just the thermastat. Had a problem with that to on the C but mine was stuck open rather than closed. weird thing about it though is that it fixed itself last month
going to replace it just in case though
He brought it back with him to show me how totaly fooked the old pump was .The spindal was severly loose which was leaking coolant and one of the fins had broken off