I thought I had decided on the CL/CLE but now I am having second thoughts on the CLE because of the battery requirement.
It's become harder to make the final decision than I thought (mostly because I'm so anal about things)
My e-Bay watch list is now quite long... I am also looking at KEH's listings - I have had very good experiences buying from them.

There is an M2 in APUG's classifieds that looks good and comes with a 35mm but I am not ready to purchase just yet (hint: tax refund has not arrived).