That's exactly what I'm doingI'm hoping for a bump to the 16" MBP with a slight SSD upgrade price reduction and Wifi 6. I'd be delighted to jump in then..
I honestly don't see the 16 inch getting upgraded anytime soon, maybe mid next year once Intel has improved yields of the newer 10nm chips. Also I think Apple would wait till AMD pushed out something more powerful. You would want the marketing to show the new "MacBook Pro 16" is faster in both CPU and GPU workloads.