Had the same problem codes thinking it will go away with new OS, but did not. Had to buy a new Water Temperature Sensor 99660641000. Easy part to replace, first disconnect batt. Water temp sensor its located on the oil pump. Clear codes at the end. Since then had no code issues.
Hope it works for you. Good luck.