IIRC the housings on the S4 and S5 TIIs are the same, the differing stub shafts were due to the configuration of the meatball. I have both and S5 and S4 diff out in the shop somewhere. Let me take a look to be sure.
If the housings are the same, I would use the S4 stub shafts, but you may want to call KAAZ to be sure. I think mazdatrix carries KAAZ as well, and they'd probably know...