2000pt old school grudge match vs tau

This son of a biatch has been noob-bashing around our local with his tau and I've been nominated to take him down (actually he is a really nice guy but he plays tourney style and doesn't pull any punches which I respect).  
 
Old school 2kpt grudge match, no double force org, stronghold, forgeworld, escalation, formation, dataslate, supplement or allies bulltish but we can tailor our brains out!
 
He will tailor against DE big time, he told me so, so based on his form I am expecting...
 
Small farsight bomb, 3 or 4 crisis suits
Crisis team with missile pods and drones of some sort
Ion riptide or 2
A few squads of fire warriors
A few squads of kroot
A few squads of pathfinders
Maybe a devilfish
2 Hammerheads
Broadsides with rails and drones
 
So here's what i'm thinking...
 
Archon- Huskb, shadow, drugs, soultrap
 
4 Grots- Raider- NS, EA
3 Trueborn- 2SC, Venom- SC, NS
3 Trueborn- 2SC, Venom- SC, NS
 
5 Warriors- Venom- SC, NS, gristly trophies
5 Wyches- Haywire- Venom- SC, NS
5 Warriors- Venom- SC, NS
5 Warriors- Venom- SC, NS
5 Warriors- Raider- Gristly trophies
5 Warriors- Raider
 
3 BM- 10 Khymera, 2 flocks
6 Reavers
 
Ravager- NS
Ravager- NS
Ravager- NS
2000pts.
 
So as you can see the Venoms and trueborn take out the markers first then move onto the long range tides and suits. BM, Reavers, Archon + Grots draw fire (2 extra raiders for transport if needed). Ravagers do their thing.
 
I was thinking of dropping the reavers for the Baron and some more beasts or a Heam and upgrade 1 unit of raider warriors for a good sized wrack unit... What do you think?