Should I upgrade to an RTX 5070 now or wait for a possible 5070 Super?

I'm currently using an RTX 3060 Ti and thinking about upgrading. I've had some issues running games at 1440p, like Final Fantasy XVI, where the performance dips significantly, even with DLSS enabled. I'm also facing VRAM issues in games like Monster Hunter Wilds and Oblivion Remastered, and I'd like to avoid lowering settings anymore. The RTX 5070 seems to be well-priced in Brazil, but I've heard concerns about the 12GB VRAM's future viability. Should I just bite the bullet and buy the 5070 now, or is it smarter to hold out for the rumored 5070 Super with 18GB? I know it sounds like I'm overthinking it a little, but I want to make the best choice!