I was thinking of both of those (considering killing it + the 2023 deadline) as a single leak.
A few months ago, someone I know who is close to the issue mentioned something along these exact lines to me. I shortly moved all of my GCP projects to a self-hosted server. Glad I did it.