Here's my opinion and hopes,

We all know the apps by Adobe and how much it's hated for its learning curve and bloatwareness.
They wouldn't make the mistake to put it into one app.
I think that the new marketing strategy is going to be more like the serif approach.(No,I don't mean the not providing trial versions)
Separate programs for different tasks.

-A DTP program with some vector and photo editing capabilities.
-A vector/drawing program with more vector,3d,animation tools
-A webprogram with the best of the other worlds.

And have the formats being interchangeable.
This if you buy a suite/studio it would make sense

Hans