I'll chip in again, just to share experience - not to push any preferences or solutions.
Honestly, if I had some money laying around, I'd do the best brakes upgrade there is. Same with rear shocks - Ohlings that would probably set me back a couple thousand dollars? Why not - for riding! All the original parts would be tacked away nicely on a shelf.
On my bike, I did a complete rebuild of both calipers, including one brand new piston. The master cylinder - re-sleeved with stainless tube and of course new rebuild kit.
I found the brakes to be quite stiff. Maybe because of this? Even with a passenger, I had quite a number of sudden intersection light changes that mimicked emergency situation. It's true - I had to press hard on the lever, but the bike stopped dead no problem within safety. More power would make the tire slip, and I'm sure that would had happened in wet conditions. I was going a regular about 50-60 km'hr speeds. I have no problem locking up the rear wheel in dry conditions at much slower speeds.
For sure, for easy of operation, an upgrade absolutely makes sense. A powerful brake can be activated with one finger and do the job, and be safe after getting used to it. What I am saying is I am not feeling unsafe riding with what the bike has now, that is all original but properly refurbished.
Looking froward to see exactly which upgrades did you choose guys - photos please!