That's shit mate, the banks can be such dicks at times.
If I were you I'd take the longer mortgage but look to move lender if possible ASAP and get the debt paid before retirement.
I think their lending requirements are far too rigid, and allow no room for common sense.