Conceptually, using what the SEO community feels google does every time google does an algorithm change that muddles SEM / organic after a revenue drop (source: mozcom 2019), you would have to assume they would keep marginally pushing incremental borders to ameliorate any drop or “lower than wall street expected growth” in ad revenue. So the OPs approach to fully migrate is consistent with that world view.