Well consider that the more you upgrade the front, the more you move the brake bias to the front.
Theres only so much traction in the front and if you have too much brake force in the front compared to the rear then the fronts will lock up first.
I'd just do the 12's and the stock calipers for now and see if you like that.
But before that again, I'd try a higher performance pad first.