I went the opposite direction 2 years ago, performing the same exercise for M42 when I finally decided it was time to join the Spotty and S-series ranks.
I posted this some years ago. It isn't a cheap kit, but works more than a charm for me and has. (Compactness has always been one of my necessities.)
More recently I've been using just a two lens kit:
M 28/2.0 (this little gem has all but replaced my use of the FA31, not because it's better --it isn't, but it's close-- but because it is 1/3 the size.)
A 50/1.4 (I prefer the M variety for its build, but haven't had one in a long time. And the A is slightly lighter so I've stuck with it.)
Or just a single walk-around for me is nearly always the FA43. (I've *never* gotten on with the 40mm pancake. Don't like the rendering. Don't like the handling.)
All that said. Colton's original suggestion is where I'd start. For the price and availability if nothing else, and results that will speak for themselves.
---------- Post added 12-11-19 at 12:21 PM ----------
I'd also add that there's NOTHING wrong with the ubiquitous M 50/2.0.
You can find them for nothing, and frankly, I've always loved their rendering. Moreso than the 1.7 if I'm honest.