If you can get down to an effective 21mm with whatever camera, would be my pick. I am not familiar with the Mamiya, but $300 to get 21mm on a larger neg, that sounds like a steal. I would imagine paying that much for the viewfinder.

I have a G2 with the 21mm, and it has been bolted on there since the day I bought it.