only you can decide -- if your preferred lens is the 35, you should go for the M2 because the M3 viewfinder adapted 35mm lenses are very good, I use and love one, but it does darken the viewfinder.
If your preferred lens is the 50, get the m3, but it will also work perfectly well on the m2.
If your preferred lens is the 40, you have made an excellent compromise. Find a good condition CL, away you go. It is my favorite travel camera.
Whatever you get, you will not regret it.