I agree with the argument for shrike.
Sc's can add pretty good tactics and abilities, but a homemade captain can still kick arse. I suggest artificer armor and maybe a jump pack. Stormshields are nice but your Iron Halo still has a 4+ invuln save and the look out sir rules will remove a lot of worry from the stray lascannons shots. Also, meltabombs got good as moving vehicles are now
WS 3
Personally I think that terminators are overrated. They never really do anything for me but eat plasma.. Although for those points you can get 2 typhoon speeders and still have 25 points left over! I only run one but it can cause a lot of headaches
assault marines... you got the battleforce didn't-cha?

sorry, no advice there.
I agree on the vindicator points and the whirlwind. I gotta warn ya though, Vindicators always, always have a "shoot me!!" sign on them.
Hope this helped!