Upgrade path for my mains - incremental vs. wait + all in?