Hmm this is difficult because eldar are super cheesy in nearly all aspects. Just a matter of what you truly like to do, but as a main eldar player I can offer a fair amount of advice here, especially as I just hammered out my 1850 list as well with my main opponent using the skyhammer annihilation force and mass alpha strike marines so it correlates I believe. That was for itc though and I'm not sure your restrictions but a few things to note.
Min max your jetbikes in squads of 3 and take them as scatterlasers for extra range and shot, always remember to use the
2d6" assault movements to get out of range and reposition every turn, even if your opponent rolls his eyes cause he thought it was his turn after you were done shooting
.
Take the wraithknight as sword and board with star cannons(scatterlasers are fine if strapped for points). It's tempting to take the heavy cannons but you will find the 5++ save will help immensely with alpha strikes, especially when coupled with eldar psyker awesomeness and the D melee range is very easy to engage with your 12" movement to make up for no D shooting. Oh and don't fret if it dies, it is much better for your army if they waste time shooting the wraithknight than killing your jetbikes(which are the real core as they shoot from afar and potentially move 48" a turn for last minute obsec). I like to give fortune or forewarning to the knight just to make them think I don't want it to die so much and it almost makes them want to make sure it dies at that point(which is actually what you want)
Vaul support batteries with D-cannons are actually quite amazing, the barrage lets you ignore line of sight cover which is super awesome. And only 55 pts on a toughness 7, 2 wound platform.(Crimson death formation is also fantastic with a 4+ cover static, re rollable if you jink. But but it's more specific towards your area as it's only good if you come across a lot of high
AV and little anti air, basically don't use against tau or anyone who uses stalkers in space marines, also bad against mass horse armies as there are no real big targets to shoot).
Instead of soaking so many points Into one seer council, break it up into 2 groups of one farseer and a 2 warlock conclave each, you lose the 3+ harness but that's right, your already ridiculous enough in psyker phase. That, and it gives you a total of 4 units that can split off and grab objectives no issue. Not to mention giving them more targets to shoot at(notice the theme of small squads so as to avoid any obvious targets
). Your going to basically want to roll one farseer off divination and hope for misfortune and perfect timing. If you get both Than roll off runes of Fate for the second farseer, if you don't get both than roll both off divination as it will do more for you overall(mainly hoping for perfect timing and misfortune but at the very least prescience is excellent to have). Warlocks one and only job is to keep conceal on their respective units, if they get a useful power than of course use it, but generally you just want the shrouded on the mini seer units for the constant 2+ jinking.
And I also love the void shield, and use one in my list. I highly suggest putting it back in. It gives soo much help against the grav drops, as even if they break it. They had to target it first, saving your units from potential death
As a final note, while most complain about the wraithknight or the Scatterbike spam, this is a common mistake. The single best unit in the entire codex is the warp spider, take a good look at them. Especially taken in an aspect host formation to give the
BS 5. Other than the fact they are one of the most mobile units in the game with their flicker jumps, assault jumps, and deepstrike ability. Their gun has the ability to wound any non vehicle in the game very easily as it wounds off of initiative not toughness and is pseudo rending(Bladestorm makes to wound Rolla of a 6 automatically wound at ap2 although no effect on vehicles).
That's all off the top of my head, there is probably more but it's nearly 5am and I'm tired xD. If it's not enough I'd be happy to share my list and work out the tweaks to yours. Thanks much for reading my super long rant and good luck.
From the two lists though, I would probably go with list B for the reason that one Wraithknight is guaranteed to draw all your enemies fire on turn 1 so taking 2 is safer. Plus, the rest of the list will still be good for attacking the enemy quickly. Sorry I can't be of too much help, but that is what I think 
1000pts Space Marines 
1200pts Tau 
2500pts Blood Angels 
3500pts Imperial Guard/Renegades 
and 1700pts Daemons 
