The laowa 10-18 can possibly replace the Leica. Looks compact.
Charlie, there is plenty to agree with in your post from my perspective. I'm now at a point where I have no craving for anything out there from a lens perspective, it's an odd feeling actually.
I've built a great manual focus kit built around a really nice set of Leica and Zeiss and VC M mount primes and also a fantastic set of native auto focus zooms and primes, really great place to be. My only regret is selling my Leica Tri-Elmar 16-18-21, it was such a compact lens, I miss it every time I go out with my prime kit.