I booked direct through Etihad this time. All online, including selecting my seats.
No hiccups and less than 600 quid...can thoroughly recommend them.