Which lens should I pair up my 85 1.8 with on my 40D?

So I just got a 40D in today and I'm loving it much, much more than I liked my xsi (RIP....err99 broken shutter). It blows it away in every department and was well worth the $300 that I spent on it (only 16K shutter count it's rated for 100K shutter count).

I'm going to be primarily shooting portraiture/products outdoors and in a studio. I love the distance compression that the 85 gives me a long with the clarity and bokeh a long with the OOF ability's.

I liked my 50 1.8 a lot for it's IQ but hated the inaccurate focusing.

I'm looking for a lens that will serve me as a portraiture lens when I want something wider than 85 or when 85mm is too long.

Right now I'm thinking about the Canon 35F2 for $290 or the Sigma 30 1.4 but I'm put off by the reports of it having inaccurate focusing and the Canon 35F2 having harsh bokeh and not having USM.

Would the Canon 35F2 still be a good choice and will it give me the same if not better optical quality than the Canon 50 1.8?

I need a lens that will be able to still be a portrait lens without being too wide.

I could wait for the Sigma 30mm 1.4 remake but chances are it will be priced around $600 if not more.

Any suggestions would be greatly appreciated.