Finally did the last anticipated upgrade, the brakes.
I was thinking about the brake upgrade for quite some time, also which brakes would be the best option for me, and I came up with the following combo:
DBA 5000 T3 rotors
EBC RP-1 pads (front and back)
I also picked up EBC Bluestuff NDX pads for backup, because I already had those and they felt really good.
Will try them in the following days when the weather gets better, and proceed with mating and bedding in procedure.