I think the line-up for laptops will be something like this for at least the next 6 months.
Macbook Air 11" Core 2 Duo
MacBook Air 13" Core 2 Duo
MacBook Pro 15" Sandy Bridge i5 and/or i7, NVidia GPU
MacBook Pro 17" Sandy Bridge i5 and/or i7, NVidia GPU
All models will come with SSD storage as standard.
All models will not have an optical drive.
We'll see a complete redesign for the Pro line with more space for battery.
If they remove the optical drive, it is more likely they will put a 500GB HDD there and put 128 and 256GB SSD's in the already existing HD bay. They may also rework the space the ODD takes up to fit an SSD blade and extra battery in there. The 512GB SSD's are still extremely expensive and unless Apple got a sweetheart deal from an OEM then they will probably go with a hybrid system, as they likely wont go up to 500GB standard and then retract back down to less than 200GB.