It's back in the garage, again! The problem it was taken in for was not fixed, but they fixed something else instead. It turns out that the bearing for the compressor was knackered, and all the smoke that was coming from the engine was actually coming from burning rubber that was part of the bearing, rather that the engine itself. This is a good thing; I though my car was absolutely fucked.