My B7's Thermostat failed in that it was fully closed when cold, but opened prematurely. If its not the Water pump, i concur with everyone above that its the thermostat. Get wrenching!