It depends on what your current configuration is, and what you're using them for.
I like option 1 because its offers more variety. Excellent wide angle + a damn good lens for portraits. (if you intend on getting the 85 1.8)
I like option 2 because it offers more or less the same wide angle results, but adds a really solid low light prime.
I went through a change of lenses recently. I thought that working with a series of F4 zoom lenses and backing them up with strong primes was the way to go; for the longest time it was manageable. Then you miss a shot or two because the action changes from far/near (or vice versa) and some lenses can't accommodate that switch as well as others.
I went from 17-40L/24-105L, to 16-35LII/24-70L. I still have my 50mm 1.4 and my 85L, but I find that I generally don't need to switch out my lenses as often.
In relation to zoom lenses and light, every little bit helps.