To bring this thread to a close, finally signed a lease on a loaner 430i Gran Coupe:
It was much easier to deal locally and with the loyalty, waived lease termination and waived charges on my current lease, it made financial sense too. Not the best possible deal but I’m happy with it and with the car. That’s all that matters.