Well, I am back to square one. My daughter and I leave for 10 days in Istanbul in two weeks and I just ordered a Leica Dlux 5. I tried an M8.2 and a Nikon D7000 and had a X100 on order but realized I really enjoyed the Canon S90 I gave my daughter at XMas and I did not like the expense or size of the other cameras. And for the amount of photography I do, another point and shoot would be great. And the Leica comes with a nice software package which will enable me to learn digital techniques.
Presently, I plan on taking one of the M's with 21/50/90 and probably load it with black and white. (But the 15 and 50 are so easy to pack I hear myself saying). I will use the digital for color while contemplating buying an analog darkroom to rediscover my youth.