For non-geeks the first option is the only viable one, IMHO.
You've obviously settled on the same conclusion.
Do you know how OTA updates are pushed out for the non-Google Android phones that are bought without a contract?