I travelled via Abu dabhi few months ago......U dont need a VISA AT ALL....Trust on me. Don't listen to consulate. Sometimes they don't know such things...If you want to go outside of the airport, yes you'll need visa but if you're just staying inside the airport. U don't need visa.
BTW Etihad is pretty good. New aircraft. Nice service. 3000% better than Gulf.

But renewing F1 is more difficult these days..i know 2 of my friends were denied for renewal when i was in Nepal.Good luck with that.