I would go with the 24-70 II and add one of the primes later if you still feel a need for a faster lens.
I currently have a 24-105 and its fine for landscapes and general outdoor photography, but plan to buy a 24-70 2.8 at some point for a standard zoom I can use indoors with natural lighting. I use 35/50/85/135 primes for that now, but there are many times when a zoom would be handier. We have a 12-month old son and my primes worked great indoors with him until he became mobile a month or two ago. Now, I miss a lot of shots while changing lenses or moving (when he sees me pointing a camera at him, he crawls toward me a full speed). When I get a 24-70, I'll probably sell my 24-105.