Propshafts are different lengths by the looks of it, so I doubt it'd be a direct bolt on from what's on sale above, sadly.
3.0si: 1181mm or 1223mm (auto/manual) https://www.realoem.com/bmw/enUS/showparts?id=DU52-EUR---E86-BMW-Z4%203.0si&diagId=26_0229
Z4M: 1170mm https://www.realoem.com/bmw/enUS/showparts?id=DU92-EUR-08-2007-E86-BMW-Z4_M32&diagId=26_0230