I like both your choices too!

You could use Nalani?

Amity
Neisha
Sarita

Goodluck! I'm glad I had a boy, girls names are so hard!