I'm in a similar situation and i'm going with a 5900x FWIW. The 5950 feels a little overkill, I don't expect to be fully taking advantage of the extra cores.
So far my thinking is that I'll go with the 5950x since it's more or less on par with the 5900x for gaming performance but has slightly faster single core performance. Also more cores are nice for running tests.