Honestly, this was super helpful! I ended up blending ideas between your two builds, and just got my tank up to 30. I think it turned out pretty well, and overall I'm happy with it! She's certainly not optimized, as I think she's on her 3rd life at the moment, but for what I have, I think she's great!
Thank you so much for the feedback, I really appreciated the reply!