I second that! There shouldn't be any problem at all in getting to your return flight. I would also (if possible) try to see Geneva a bit by exiting the airport, although the airport itself isn't bad either. Lots of friendly people, easy to chat with locals and friendly French travellers who live close by.

Bon Voyage!