I think the ESPs have been included the last few years, but they qualified only for the lesser rebate amount (like $6).
Also, you may not find x3 anymore. It's been replaced by x4 around me, which isn't Dexos 2 rated now.
From a SAPS perspective, it's good for GDI. Since most diesels are turbos, I assumed it would be fine for TGDI. But I know that's not exactly equivalent.