That sounds like a great setup. I switched to a Nikon with a 40mpx sensor and their new mirrorless lenses are crazy sharp, even the cheap ones. I have all they have released and it seems even the kit lenses are sensor limited. Incidentally, i really dont like any of those lenses for potraits of ordinary people, with no makeup and fancy lighting and postprocessing. Every skin por, every small imperfection shows. For this I default to the old lenses and the subjects are happy.
I have most of the meaningful AI era Nikkors but then almost completely gave up on 35 mm after getting the Mamiya and two Rolleis. I still used the 35mm Planar though, love it. Sold all the AF Nikkor stuff I used on the dSLR and got a Panasonic m43 with two primes. I will get the 15mm Leica DG next, to replace the unremarkable 14 mm Panasonic. Not going to lug around dSLRs any more.