Looking for a New Air System

[Strider]

So I got to go out and play Paintball for the first time in 5 years last weekend!
Yes, legs are still sore, 3 days later...

Anyhow, I was told that despite passing hydro, my '99 HPA I have with my Flatline valve has past it's "shelf life" or something.


So I'm looking for a replacement. I run an Emag on an Xvalve with a custom drop.
Whats the recommended tank and regulator these days? I don't even know whats out there anymore...

Bonus photo of my setup from the weekend. Alas due to my emag battery being toast, had to remove the warp feed for now. (It wasn't working in vibrate mode)