Option 2 sounds great. I'd have an absurd amount of awesome games to play whenever I want for free, and some of those games still have working online communities to this day. Not that I care much about those, but still. xD
I don't mind waiting a huge amount of time to play games, I've done that regulary. Plus I like to revisit certain games, and I wouldn't want that privilege to be taken from me.