I'd go for the 24-70 ii, it is a perfect 1 lens setup for weddings and portraits.
Regarding the 50mm vs the 85mm, a 50 would go really well with FF, and the 1.2 is great. It is a necessary step up from the 1.2. The 85 is great for bokeh, but is a specialty lens. The 1.8 85 is swell, and gives you an ok depth of field, as well as fast focusing. My friend has the 85 1.2, and I have the 100mm l as well, so we did a comparison. The dofis amazing on the 85, but the 100's telephoto capabilities reall blew out the background and gave great image compression. The 50 is a better lens for weddings, especially since that is where you'd need it most (since you have the 1.8 now) and the 85 1.8 is stellar, carrying around the 1.2 at a wedding will really be a hindrance, because you'll see a perfect moment, and then have to switch to another lens.
Get the 50, once you get more into static portraiture, get the 85.