The coolant will "gurgle" when the thermostat opens. If the bubbling stopped, the headgaskets may be OK. I hope the waterpump fixes it, it really sounds like your car is doing what my car did for the previous owner. It's possible the new waterpump impeller has spun on the shaft or cracked. Maybe the shop that did the work needs to be contacted, but you can't drive all the way there. Keep us posted, good luck with the repair.