I got a good deal on a 1969 Makarov right before the AWB in the early 90s. It’s a nice little piece resmebling a ppk and it’s quite accurate after being used by Russian cops for some years.
Glock mod. 22 (.40 cal) solves the problem with 9MMs.
Love my 19 too. Works well, accurate, cleans in a jiffy. However, I’ve noticed some accuracy problems with the hi-cap magazine. That might just be me though - can’t handle a 32-round mag extending beyond the end of the grip.