Yes I think you're right, facelift coincides with the engine change.
Table here:
https://www.google.com/url?sa=t&sour...gBl1i0JSczA_5z
But as said, I also wouldn't go anywhere near an 18k interval - interestingly (or not!) my C70 T5 2007 is 12k, not 18.