I'm strongly considering the X-Pro 1 which is 16MP, and I'd probably opt for an A7 over the A7r ...
I'd strongly suggest that whichever way you decide to jump, do
NOT sell any of your Leica lenses until you're 100% sure of which way you want to go.
The comments and the (in)compatibility of some Leica M glass on the Sony is well documented. Do a search on posts by Iluvmycam, on this site - he's written good first hand accounts of using Fuji compared to Leica
in this post and others. Also
this thread. Another good source is
Sean Reid - a subscription site but well worth the modest outlay if you're seriously considering anything close to rangefinder photography. He's also commented on the A7r.
Regarding RAW converters and the x-trans suggest you look at Iridient Developer and CaptureOne V8. Haven't done full testing on C1, but first impressions are that the results on the x-trans files (and the others) are exceptional. I was amazed at the difference. I think they've got a 60-day trial , so if you're not already using it, suggest you try both these converters before deciding.
As far as the Fuji goes, judging by the rebates they're offering on the existing cams, likelihood is that they're going to introduce new upgraded (24-?) mp models within the next 6 months. Why don't you either rent, borrow the discontinued X-E1, (or as a last resort 'buy' - it now costs about as much as a Fuji Leica M adapter), in the meantime. If you do go Fuji, factor in their adapter, it'll cost you double - but it's worth it for the in-cam adjustments and exif advantages it offers.
One minor point, you don't say what type of photography you're doing, landscape or people, nor your preferred style of working. But if the latter, Fuji has an excellent Auto-ISO implementation where you can set the minimum shutter speed as well as the min/max ISO values. On the Sony, you can do it, but it's a workaround.
Lest you think I'm biased, I'm not. I run both the A7r and the X-E's - they're complementary, each has it's strengths.