Quoting Clk:" I wouldn't wean her off of the swaddle if she really needs it. Our three year old was also like that ... [snip!] ... oldest didn't sleep through the night until 2 1/2 years old, but we just stuck with it and comforted her when she needed us."
I'll probably just keep doing that then. She gets her arms free during the night and she's okay with it, but she won't ever go to sleep unless her arms are wrapped up tight... I swear she's gonna be 5 years old and still asking to be swaddled before bed