keep it easy, keep it simple.
I'm assuming your front discs are 238mm vented.
So grab a set of CYNOS Beta or Starlet GT Turbo front and rear discs and calipers and cables for a conversion.
254mm fronts ; 240mm rears.
While you're at it throw in some decent (castrol srf) fluid and mintex 1144 or 1166 pads on the front.
You WILL notice a huge improvement. The mintex friction material and better fluid accounts for the most difference in this upgrade.
Cheers,
Paul.