Sourced some front and rear calipers from a 335i.
Just started in on cleaning them up so it will be a bit before I have everything detailed.
Hopefully this will help others in the future.
Brakes come from a 335i 2007-2013, also found on x1 35i and Z4 E89 IIRC.
Rears go from 300mm to 336mm
Fronts go from 312mm to 348mm