My two cents: tell her now when you expect to return. When you tell her, ask her for a date on a specific day shortly after you return. Don't tell her that you like her right away, just see how things go. If things go well, you will have plenty of chances to tell her how you feel.