Thanks both for the help!
It's good to know that I'm on the right track and that the list doesn't totally suck. I guess I need to wait a couple of weeks for the new codex.
Thanks serberk for the proposed changes. I'll consider drop pods instead of rhinos and I'll keep a close eye on the new stormwolf too.