I would suggest adding Ferodo DS2500s as your front brake pads. I use them for braking late into corners on track days and they're extremely good.
There's no real need to change the discs/calipers. I'd also mention that the stock pads seemed to me to be a bit prone to glazing and I don't think they were operating at 100% of their original power when I took them off.
The DS2500s cure all that and provide plenty of stopping power with the stock discs. Unlike some track pads, the 2500s only require a small amount of warming to become effective from cold, slow a couple of times on your drive/road after leaving the house and they are fine for the rest of the journey
Oh and if you are going to be doing track days I'd upgrade the fluid to something with a higher boiling point like ATE Superblue. However, for anything less than track day action, the stock fluid is fine with DS2500s.
Brat Pack no.8