If you don't need shift to correct the verticals, a shift pano with the TS-E 17mm gives you an 11mm FoV.