Google Drive vs. iCloud

So Google now only wants ten bucks a month for 1tb of Drive Storage.

This is crazy. It would be enough to save backups of my MacBook in the Google Cloud, backup all my pictures form my iPhone and maybe even store some Movies.

But as you can see these are all Apple Products and I would much rather have it that Apple comes out with a similar solution better integrated with their devices. Right now iCloud can be nice but I miss some Features like easy and big and easy cloud storage for files. And really the Photo Stream is just a total mess.

Do you think Apple will release a big update to iCloud in the future, maybe this year at WWDC?
What Features do you miss form iCloud and do you also think about switching to Google Drive?