The pentax 6x7 has a very decent 45mm, with the added benefit if being a reflex, which helps to keep all lines vertical. But this is provably not as sharp and lightweight as the Mamiya 7.
Using wide angles definitely takes some getting used to. I find that for architecture they're an asset, so I generally have one. On square they work pretty good.