Raid, just from having looked at your photos a lot, I think you would really like a modern version of the 50mm f/1.4 Summilux pre-asph. It has very nice bokeh, it is still sharp, flare resistant, and it is not super expensive. It seems like it would be all you really need to me. Perhaps I am wrong with regard to your tastes, but you don't seem to have a taste for the ASPH optics, but you want a do-it-all lens, so I think the 50/1.4 pre-asph would be a great choice. For the same reasons, do you need anything more than a 90mm f/2 summicron pre-asph? It is very sharp stopped down, and wide open it has a nice softness. It is fast, and you already own it.
Now don't get me wrong, I don't want to tell you what to do with your gear and so forth, but if you are looking to simplify, it seems like the latest non-asph Leica lenses would give you the balance of performance and build-quality, along with pleasant character that you seem to like.