Ended up selling the MacBook Pro and the 12.9” iPad Pro and buying the 2017 15” MacBook Pro in July and then the 10.5” iPad Pro with att next in September. I’m all set now.
Almost forgot. Still have the iPhone 7 Plus. Don’t have the money or interest in upgrading this year.