Well, so far so good. Replaced the entire tank, from BMW. $130 which I didn't think was bad with all sensors and new o-rings. Just topped it off with coolant, drove it up to temp (using the scan gauge 2) and checked the level.

Seems to be doing ok. I'll report back after going to work tonight if anything happens.