I just wonder how much longer you can count on overclocked 9 year old components. If nothing else, start setting some money aside so you can make a move if something finally gives out. It's hard to find those old motherboards for cheap anymore, and even then, it's probably not worth the risk, especially when you can move to a modern platform for not a whole lot more. NVMe storage is one of the better upgrades since that era, especially for game load times and (in my case) RAW image processing.
If it were me, I'd save up to get at least a 3600X + B450 build, and stretch the 1070 for a little longer. We're finally seeing some movement in the GPU mid-sector, and some next-gen hardware is just around the corner.