You have a massive leap to jump into. If you want to maintain the i7 tier, I highly recommend 13700 or newer. You will find great deals out now, especially if you have a Microcenter near by. Keep the 1070 for now, you will get a very nice fps boost with the CPU upgrade. Then later decide if you truly need a new GPU or not.

If your just gaming without care to maxing everything out, both chipsets are perfectly fine. People recommend 3D CPUs for more fps in games, but you need to pair it with an enthusiast grade GPU if you really want max fps. It’s all silly and realistically unnecessary, you can game with any i5 or R5 CPU and equally budget GPUs.