Definitely go with a Mamiya 6. Sharper lenses than the Hassy and much quicker and lighter to shoot. RF645 is a good recommendation too, but not 6x6. If I had to choose one of the two you have I'd go with the Leica.