Thats a frustrating experience for sure, hope your matter gets sorted out soon.
The thing with Etihad is that their service is quite inconsistent. I flew to Chicago last month for a business trip, and was surprized at how different the service was on the two flights. On the outbound leg, the aircraft was a bit older, the "seat-belt on/off" lights in the entire J cabin did not work, and my attendant call-button was also defective. Yet, the crew were very polite and helpful.
On the return flight, the aircraft was newer, and everything worked, but the service was indifferent at best, and frankly below par. I even had to ask them to give me a menu card and the AUH immigration fast-track card, both very basic items of service.