I think
Ebba is very nice, but have the same problem finding a longer name for it. I'm not a big fan of Evelina/Avelina, so I don't really like
Ebba as a nn for it.
Elisabeth is nice with
Ebba. Elsbeth works even better I think. I can't think of anything else at the moment.