Yeah, it's not your gear, it's that you're 24 years older. You could very well get the gear madness anyway, but what matters in the end is that you keep skating as often as you can, get comfortable riding your board, keep working on getting a fluid ollie back, do it up and over things, do ankle/calf/hamstring exercises, etc. You have every reason to hope for your pop to get better than it is now, but that's your 2022 pop, which you should absolutely not expect to be as good as it was in 1997. You are not that person anymore and you are effectively starting over until whatever muscle memory you have kicks in.
I stepped away for about half as long as you, and I can say from experience that your pop will come back as much as your bodily limits allow, provided you keep doing things to make it better and then to maintain it once you've sort of plateaued. But just skate however you get the most out of it, it's pretty much the best thing in the world.