Congrats on the pregnancy!
I like the names you've got so far. For girls, I've always thought Ginger was cute (thought maybe not for everyone), and Thandi is adorable.
I love Xander, personally -- I wouldn't give that one up just yet. It has skyrocketed in popularity, true, but it's still well outside the top 200.
Here are some other ideas for you...
Boys: Giovanni, Zane, Talen, Finley, Beckett
Girls: Riya, Kinsley, Meadow, Ryann, Mahalia