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.