Looks like you're doing good.
I just went with a metal tank, but with a remote. She seemed happiest that way, so I think it'll work out. I got her a mask, but not the pink color kit yet. She'll just be using my old halo B hopper, unless I find a deal on a pink one