If you're down to 2 wait until he's here and see which fits best.
With DC2 I was sure I'd call a girl Eleanor. When she was born and DH said 'it's a girl!' I called her Eleanor right from the start. Then I calmed down and looked at her. It wasn't her name. She wasn't an Eleanor.
We decided on our second choice girls name instead as it just fit her so much better.