1850 Craftworld Eldar List

Hello fellow scoundrels of the Dark City!

I've been challenged to a match this weekend by a bloke who wants to test out his list for a tournament. He's running Ultramarines and I'm fairly certain he'll include Calgar, otherwise I don't know much else about his army - He may have a small attachment of White Scars Bikers. The point limit is 1850 and he specifically asked for a match against my Craftworld Eldar. Below is the list I've compiled.

Craftworld Ghlacius
Eldar 1850 Pt list:

HQ:
Avatar of Khaine
/w Crushing Blow
/w Fast Shot




Warlock Council
/w 2 Warlocks


Elites:

Fire Dragons x 10
/w +5 Fire Dragons
/w Fire Dragon Exarch
/w Fast Shot
/w Iron Resolve


Fire Dragons x 10
/w +5 Fire Dragons
/w Fire Dragon Exarch
/w Fast Shot
/w Iron Resolve



^Wave Serpent
/w Shuriken Cannon
/w Scatter Laser
/w Holofields


Troops:
Storm Guardians
/w Flamer

Storm Guardians
/w Flamer


Dire Avengers
/w +5 Dire Avengers
/w Dire Avenger Exarch
/w Power Sword & Shimmershield



Rangers
/w +5 Rangers

Rangers


Heavy Support:

Fire Prism
/w Shuriken Cannon
/w Holofields


Wraithknight
/w Scatter Laser


Grand Total: 1850


[Edit] This will be my first game running an Avatar [I made him from the Durthu treeman model, so I'm proud to show him off!] so I wanted to know if I kitted him out correctly. The Warlocks will go with the Storm Guardians, and I added a 5-man squad of rangers to the mix for another scoring unit.

Any suggestions?