I remember your kit from Flickr actually (I think I even commented on it) and thought it rather perfect.
But we're all human of course and G.A.S. is a real pain in the backside. It's imho only cured by the mental operation of telling onself that one is happy with what one has, which usually is assisted by looking at the output rather than the tools (and btw you have some great stuff on your stream).
If I were you - and forgive me for being drastic here - I'd sell all but one camera, and if I were to choose that one camera would be the M4, given what you've said about not needing a meter. It's the best non-metered M ever (I love mine). I'd also sell the 50 rigid because I prefer v 4 (well, I should be honest and say I have v3 which I really really like and use on my M4).
If you want to sell only one, then for me it would be the M3. I personally use a TTL with my M4 and think it is a great and very versatile combo.
To take this even further, I would consider swapping the pre-asph Summicron 90 for an Elmarit-M. One step slower but overall better and smaller.
Just my 2cts of course 🙂
Philip