The TDCi shafts will not fit as they use a different gearbox in that model.
The ST is the only Focus to be fitted with the Volvo M66 gearbox so I think you stuck with having to use ST shafts.
The ST shafts have changed during Fords production run also - The CV joint design has been improved on the 07> cars - however we are sure that the complete shafts are interchangeable.