I have exactly the same issue and can't wait for option to switch models to become available.

Thank You for your efforts!