Everyone has their favorite cameras but IMHO, I'd ditch the Fuji & the maybe the 25mm. Get a 21mm & 35mm for the Leica. However the 25mm is a good compromise so maybe not buying two more lenses at this late in the game. I'd dither on a backup body for the Leica (vs 2 bodies with different lenses). Backup bodies are good. There is a temptation to take the M2 you own which utilizes the same lenses but ( I almost hate to say it) there is on reason to shoot film.
I really think two digital M bodies. Film cameras are almost indestructible, but digital cameras, and batteries, can you give you the fits at any particular moment. I really think a backup body is an absolute must.