Yep, definitely add a Wraithknight and then shift your Ghost units into a Wraithhost for 1850 the added formation benefits. Then run a standard CAD (like the one featured in your list) as your base.
My only other advice, and this is based on tons of experience, split those Windriders into 2 units of 3. I didn't believe in that approach at first but my good buddies really pressed me to do so and its was a HUGE difference. It splits up enemy fire, easier to use jetbike moves to get the whole unit of out of LOS, and allows you to divide up all those shots when needed. Trust me its a big help.
Also if you could hack it try and find points for a Wave Serpent for the Wraithguard with cannons. You'd be surprised by how easy it can be to pick on even the tough little Wraithguard.
Anyway it looks like a very cool, fun list which should be pretty tough. Good luck!