I am actually doing something similar to with, albeit upgrading my 6700K that has served me faithfully and put up with my abuse over the years (overclocking, watercooling, etc).
Was able to pick up a 5800X3D during the Labor Sales & some 3200 RAM. Also snagged a used AM4 board off of eBay to go...