Wide-to-Normal Lens Upgrade

Last summer, I upgraded to a D700 from DX (D90).  I'm looking to add/upgrade a prime lens for street and environmental portrait work (with landscape being an added plus).  In the upper end of the range, I do have a Nikon 50mm 1.8D but I have not been terribly impressed with the bokeh it can deliver (see first two examples).  On the wide side, I have an old 28mm manual lens that I bought off of Craigslist for $30.   While it does good enough for landscapes, MF makes it difficult for street use (when using a narrow DOF) and if you get any light source shinning at it, it flairs like crazy! (see examples 3 & 4)

I've narrowed it down to 4 options:

1)  Live with it.  Wide isn't that useful anyway

2)  Nikon 28mm 1.8G: Wider then I would like but the bokeh is alright for a wide and the sharpness is there.  Also the nano-coating makes for some nice micro-contrast in the shots.

3)  Sigma 35mm 1.4 "Art":  Great reviews and, considering the Sigma 85mm is my favorite lens, I am extremely interested in this!  Perspective is great and it is extremely sharp wide open but the bokeh looks deformed and onion-like.
4)  Replace the Nikon 50mm 1.8D with the Sigma 50mm 1.4 HSM: Great center sharpness for people and amazing bokeh.  It is heavy and very expensive though.

Examples and opinions welcomed!  Thanks!
(FYI, I have a Sigma 17-50 2.8 OS on my D90 that is exceptional for landscapes when stepped down!)

Just a personal shot of my wife when we were on vacation but it's sadly the best I've been able to get out of the 50mm bokeh-wise.  Thankfully I have my Sigma 85mm and 70-200 VRII for real portrait work!

Bokeh example using a chain-link fence.  Also, not the sharpest when open!

Flare kindof works here.  Not real sharp and took a lot of PP to even get this!

Here the flare just completely destroyed the picture!