Yeah you could say pretty much, in a sense, a lot of the movies have been Thanos Quest. Avengers was Thanos Quest. And GOTG was definitely going to be Thanos Quest. I also don't think we can really match the Infinity Stones to the Infinity Gems. it's obviously not as clear cut as that. The fact the Aether is a fluid substance rather than an actual stone just shows how different these things are from the Infinity Gems. It's the same basic concept but it's different.