I have the 2.0 and been running basically the same maps for a long time since I can't even run the newer maps. I would highly suggest checking if that setting is cranked to 90 it is on default for some maps. If not try the sensor first, I think I read its like 15 bucks and you can DIY. Definitely don't drop the money on water pump and therm before at least checking the map settings or sensor.
My car had same behavior first it would do it sporadically for a few months. Then I would turn car off and on and it would stop. Eventually it started throwing SES lights and happening more often. Had the things replaced but still kept happening. Stumbled upon a thread of Shiv stating this issue and sure enough it fixed it.