I would do neither tbh. You can't upgrade just mobo and cpu you need new ram as well. Your current cpu setup seems fine to me, maybe get better cooler and OC it if you haven't already.
As for gpu - 680 is aging but still capable. I would wait and see if nvidia releases new gpu this summer - wait at least till computex.
If you can overclock the 3770K, there's absolutely no point in upgrading, especially if BfA's DX12 support delivers.
I'd wait till July at least, maybe nVidia will release a better price/performance card that's actually on the shelves at MSRP.