Made my mind up now after some sound advice.
E36 M3 M/Cylinder (to reduce pedal travel)
E46 330 Calipers all round
E46 330 (315mm) Cross drilled discs and Hawk Enduro Pads
Straight fit, no brackets, no messing. Oh and Dot 5.1 fluid.
Will give a heads up once it's done. Thanks for the advice all.