Popularity does bother me a little but we mainly chose an unusual name because I'm a teacher and most names come with a picture of a child (and their personality/behaviour) with that name already attached, iykwim. It's mostly a boy thing, and mostly the negative ones I was keen to avoid.

Our girl choice, which we'll use if we have a girl in the future, is in the top 10 at the moment, but we want it because of family connections. Unless I suddenly meet a whole bunch of people with that name, with really strong personalities, we won't change.

FWIW, I like both your name choices.