Man, you're missing a maybe option.
Only reason I'm potentially considering upgrading from my 2015 model is that my wife is pining to move up from her 2015 13" model with the 256gb storage to a 15" with 512 gb and a dGPU for her illustration work. She isn't really sold on the new MBPs, but she really likes my computer. So one option I might consider is selling her MBP, giving her mine, and buying one of the new ones. But I definitely don't want to do it until refurb models start coming online. I won't pay this much for something I have to buy tons of adapters for.
Only reason I'm potentially considering upgrading from my 2015 model is that my wife is pining to move up from her 2015 13" model with the 256gb storage to a 15" with 512 gb and a dGPU for her illustration work. She isn't really sold on the new MBPs, but she really likes my computer. So one option I might consider is selling her MBP, giving her mine, and buying one of the new ones. But I definitely don't want to do it until refurb models start coming online. I won't pay this much for something I have to buy tons of adapters for.