Need Help with an 1850 list

I have only played one game with the Dark Eldar (about 6 months ago) and its been a long time (and possibly an earlier edition) before that. I now have my Dark Eldar army complted and painted to a point that I am happy enough to start playing. Called up the comic shop to make sure there was regular 40k on saturdays and was told they were having some sort of tornament at 1850 points. So I wanted to list for you my completed army and see what some of your advice would be for a list.

Archon (wields a staff and an orb - can count as his gear various equipment, designed to be used as a count-as Vect or others if need be)
Court (2 Ssylth, 2 Medusae, 5 Urghuls, 1 Lhamaean) - Don't have a Raider made for Court yet (if used them, how would they be coming from a WWP?)

Duke

2 Haemonculus w/ venomblades, Liquifiergun (WWP if needed)

10 Trueborn - 8 Shardcarbines, 2 S.Cannons (remove one for Duke to join) w/ Raider

5 Trueborn - 4 Blasters, 1 Dracon w/Blast pistol in Venom

9 Incubi w/ Raider

10 Wracks, 2 Liquifiers
10 Wracks, 2 Liquifers
9 Wyches, Hekatrix w/ Agonizer
9 Wyches, Hekatrix w/ Agonizer
**This is where I have a question, I have 2 Raiders (one w/ Wych crew and one with Wrack crew) and 2 Ravagers (with magnets to be used as Raiders w/ 1 wych crew and 1 Wrack crew) My question is, what unit would be better off traveling with the Haemonculi in a Raider and wich units would be better coming from a WWP (The Wyches or the Wracks?). I was thinking 2 of the units travel via WWP and the other have their own Raiders, thoughts on this?***

10 Scourges, 2 Haywire, 2 Heatlances (two groups of 5)

2 Beastmasters, 5 Khymera, 2 Flocks

1 Talos, 1 Chrnos, 1 - 2 Ravagers (one isn't finished)

now I just need to figure out what to take for 1850, any suggestions on those few things would be great thanks for the look