If there is a price advantage (and suitable timings) then I would not worry as although 787 and 380 are slightly nicer the 787 is good enough + you never know if there might be a change of aircraft anyway
Check out with Etihad if your fare is eligible for the chauffeur as that is a big advantage over Qatar