Grey Knights raising the bar

After a few test games I found myself lacking in the ability to stand up to guard shooting if I go second.  I also have found that if the enemy out ranges me (guard, razorwolves, razorangels, loganwing, deathwing) then I have to bring the fight to them.  That means I need to give them more targets to shoot at, and more threats.  I also need more long range fire power to cover my advance.

Here's what I'm looking at.

HQ
Coteaz 100
Librarian- Sanctuary, Shrouding, warp rift, 2 servo skulls 175

Elites
Venerable Dreadnaught- 2 TL AC's Psy Bolts 195
Venerable Dreadnaught- 2 TL AC's Psy Bolts 195

Troops
3 Henchmen- meltas 30
chimera 55
3 Henchmen- meltas 30
chimera 55
3 Henchmen- meltas 30
razorback- las plas 80
3 Henchmen- meltas 30
razorback- las plas 80
10 man strike squad- 2 psy cannons 1 demon hammer 230
Rhino 40
10 man strike squad- 2 psy cannons 1 demon hammer 230
Rhino 40

Heavy
Dreadnaught- 2 TL AC's Psy Bolts 105
Dreadnaught- 2 TL AC's Psy Bolts 105
Dreadnaught- 2 TL AC's Psy Bolts 105

2000

11 vehicles many of which will have 3+ cover.  Up to 8 scoring units.  20 S8 shots a turn, and up to 16 psycannon shots a turn, not to mention 12 meltas.  In combat there's a librarian, coteaz, 5 dreads, and 20 S5 force weapon armed grey knights,

For 1850 I could drop all the razors to chimeras, then delete 1 entire henchmen squad,  and cut both servo skulls and warp rift from the librarian. 

It's tight.