I was originally going to wait for the 3xxx cards but given the on-going situation across the world, release could well be the back end of this year or even early 2021. AIB will lag behind reference cards, coupled with high demand, so it may take a few months to even get one in my machine.
£350 for a 40-50% upgrade (after selling my 1070) which will last 9-12 months minimum seems reasonable to me. I can always sell and move to the 3xxx if the performance increase is worth it.
Yeah a 2070s will be a nice upgrade for you.
I have decided to wait it out, I hope im not waiting forever.