My advice is to go for a used set, but very mint M8 since it is still a very capable Leica digital. You become the owner of a true Leica still, but at a very decent price. A Leica is A Leica.
Price drop quite drastically when new model appears, and a mint M8 can be bought within your budget since you have a Canon 6D before (around similar price range).
The killer price of the Leica will be the lenses (especially those ASPH, Summilux) which you don't have to spend on unless you shoot all indoors. Voigtlander and Zeiss lenses are all good lenses, and you have options to buy older used lenses a lot cheaper.
Don't go for a M240 if you are over stretching. It will never end, as there will be a next M with slightly better sensor, features. Everytime you sell and buy again, you lose big time. A used mint M240 is dropping well in price as well, and you can track the BNS prices.
Just for your info. I bought my M9P at $10,500. Sold at $7,000. Careful user with leather halfcase since day 1. Flawless set with zero signs of use. All thanks to new launch of M240.