I am in a similar boat, wanting to upgrade my 1080Ti. At current 2080Ti costs though I can't justify not waiting on a 3080Ti. It may be late this year or early next but from the information we have it should be work the wait. 10th Gen i9 are around the corner too. Might be a good time for a whole new rig...