It will be one of the two. I'm hoping that Apple comes out with something similar to the MS Surface that runs on OSX which would be full featured, kinda like a Macbook Air chopped down and modular. With SSD I can only imagine how awesome it would be. They could drop their entire iPad line and replace it with these.
I've got a MBP with retina and SSD. In fact, the SSD is what pushed me over the edge for the retina model. It's quick and the OS is stable.
It would be cool to have touch screen capability but there are still some things much easier to do with a real computer and mouse/keyboard. I like having the iPad for casual browsing and such but it has enough quirks that I really like my MBP better if doing anything of significance.