I'd still go with Arwen, it's a good unisex name!
Congrats on your little man too, what a huge surprise xo