My plan is to change the thermostat for a new 180 just to see what happens. Ive been thinking about changing the water pump for a high flow one but havent done it yet. The heater not working and the bubbling I see from the radiator fill make me think air is getting into the system