At 21k miles the original (if they're original) plates are *probably* warped (there's an article on this subject somewhere on here), but don't think that means "you absolutely need new plates".
I had a bit of a similar problem with my '75 k a while back after I broke the clutch cable (age). I put the new one on and played hell with all the adjustments. It doesn't sound like you've tried the screw in the side of the clutch cover case yet, that might help, so read the manual adjustment procedure on that and maybe play around a bit there if you haven't already. Can you adjust it so that when your hand is off the clutch, in gear, under full or part throttle the clutch slips? You're at one extreme now, and I'm wondering if you can get to the other, if not maybe something moved...
If worse comes to worse, I'd pull the cover (apparently you can do this without getting oil all over everything by leaning the bike waaaay over to the other side while the cover's off), pull the basket, scuff/deglaze the disks (replace if necessary, you're already here, so if you have the money, why not) soak them and put them back. After this I adjusted to factory specs (lining up dots etc.) and it was 90% of the way there, a little adjustment on the lever at the bar and it was all back in business. If you do end up doing this, it's a great time to swap out those pesky Phillips for hex bolts.
For me I think it was a new oil (didn't have moly but idk, crazy) I was using combined with adjusting for a clutch cable that was a little bit different length.
Hope some of that helped.