Ideally you could create both, do some split testing and see which one converts better.

From my experience (I work at a freemium startup) I recommend going with one bundle plan. Fewer choices is usually easier otherwise they're worrying about what they need. You can always add another plan, but it's more difficult to take them away (Don't take candy from a baby!). Always try to minimize the amount a user has to think and how much pain it is to upgrade. Also, less important than how easy it is for your users, but important nonetheless: as a developer it's also more difficult to support and maintain different services/tiers

The key thing is less about what type of plan you're selling, but how well you're converting your users. Make sure you're notifying them when they're getting low on space, etc...