Pulleys replacement (accessories, a/c and idler)

[kvc]

An update on the pulleys replacement job...
So everything arrived two days ago from BMA in the US. Sadly, they sent two of the same tensioner pulleys (both for the a/c). Anyhow, after much swearing and a few grazed knuckles, I finally managed to remove the two tensioner pulleys. The idler pulley was, to but it bluntly, a real 'bitch' and required a friend's assistance with his oxy-acetelene torch. After numerous attempts removing the torx bolt, the head ended up becoming a bit rounded and the socket bit was just slipping off, so applying a bit of heat and giving the subject torx bolt a good whack on the edge, finally dislodged it and it was then easy to remove with fingers.
So closer inspection of the area revealed that the culprit causing the noise is in fact the water-pump bearing, as the pullet attached is easily wobbled around and not firm in any respect.
So now I'm up for a replacement water-pump. Not too difficult I hope but I'll definitely have to remove the fan assembly to make things easier (access is too limited). Any advice on this would be appreciated (what to be wary of).
I read on another post (E70 forum) that it's prudent to replace the thermostat at the same time, but with a lower value one (95C). I would be obliged if anyone could point me in the right direction - where I can get a good quality thermostat that's not going to trigger any fault codes. They're bloody expensive here in Oz - AU$273 for the standard one....
Something else I've discovered too FWIW - you must change the o-rings on the radiator hose fittings if they're removed as they shrink with time. Ordered a set from a US based eBay seller too.
Since I'm giving the beast a bit of a cooling system refresh, is there anything else I should consider while she's in my garage taking up valuable space?
TIA for your replies.