Thanks for the replies, appreciate it. 'Course another option is to not ride the bike beyond its current braking abilities, which I might just do. No sense in flogging a 35-year old bike like a modern sportbike, so maybe I'll just accept it for what it is and enjoy it, lol!
Understood on the rotor, the shop that did the work actually did it wrong. I wanted two rows of 12 holes each, but wanted the bottom row staggered from the top row, so they weren't right on top of each other, but rather alternated. Oh well, understanding plain English might be a lost art in some businesses.
Since I drilled the rotor, got new pads (I wanted organic pads, not sintered ones), and have an s/s brake line, that leaves the master cylinder and caliper as the only variables. I might replace the master cylinder with a newer one, to see if that improves the brake feel to where I'm happy with it. But again, it is after all a 35-year old bike, so as long as I keep that in mind, I may just start enjoying it as it is. It's got nothing on my Cagiva as far as brakes go though, but then I wouldn't expect it would, being a single disc front / drum rear versus triple discs on the Cagiva (with s/s lines on each caliper to boot).