If it was doing all that, makes me wonder if something else might need to be done such as replacing the brake fluid/bleeding the system.
Some high quality pads will always help. Hawk HPS are my choice. Then some new rotors, but only if the stock ones are really worn.
I still wonder why it felt so bad under braking.