I can tell you that the E38 25mm master cylinder is hopeless with the standard E30 brakes - almost dangerous when coupled with the smaller servo.
Pop over to the
www.e30zone.net and search for the WMS kits. They do a 4 pot kit with 280mm front discs (designed to fit the 15" BBS wheel) and a 300mm kit for 16" or larger wheels. Most importantly, they are both designed for the standard E30 master cylinder.
Or, check out
www.300mm.de. They do some nice kits using various discs but with sliding calipers - from memory Audi TT discs with 5 series calipers is one option, although they can restrict wheel choice.