Why not just pay for google photos?
So while at it move away from one more Google service.
Also haven't they said on both the big changes anything in the past will be held as legacy under free and future uploads will go to storage? I think you have to accept business needs to adapt models sometimes and Google Photos is more this than bait and switch.
Fair call on the lockout. This is a real issue for Google.
I run one on my wife's account with a cron job to grab new photos daily.
If the reason is because they want a free tier forever, that impacts the recommendation. If the reason is because they think google could shut you out, that may need a completely different recommendation.