Unless you are planning to do a number of track days per year, it would not be sensible to go to bigger calipers and rotors. Your car isn't heavy enough to need them. Nor in reality fast enough to require them. Your first post is a great package for a normal car to have much better braking performance.
Tyres are also a massive contributor to this. Don't buy crap ones to go with the brakes.