Alright. Everything seems to be fine and dandy now. Just got it back today, and they said it was airlock once again. They promised they got it all out, so as I left the dealership, I drove it for about 15 min to get it at operating temperature, then put it in park in a parking lot for another 15 min. The air stayed warm the whole time. It was only around -15 degrees C today however, so I will see in the morning. Hopefully that's what the problem was. I'll keep you guys posted on the outcome.
Eric