Revised Skaven Skryre List

Finally found my Skaven list, but after going over it I've decided to alter it. I don't have enough Clanrats to reach the original goal (and painting them has become an agonising) and have decided to remove some of them and the Rat Swarms (which I feel are useless) in exchange for a Rat Ogre or two. This is how it stands at the moment:

Lords
+Skith Warpclaw (Ikit Claw)
+Skrag the Gatekeeper (Warlord)
      - Enchanted Shield, Sword of Might, Talisman of Presivation
      - Mounted on Rat Ogre Bonebreaker

Heroes
+Snikkitch Twitchnose (Warlock Engineer)
      - Level 2 Wizard, Warp-Energy Condenser, Warplock Pistol
+Morok Geargrinder (Chieftain)
      - Battle Standard Bearer, Shield, Warpstone Armour, Warplock Pistol, Ironcurse Icon
+Grish Fellfur (Chieftain)
      - Shield, Dragonhelm, Crown of Command, Rat Hound
+Shin Swiftsteel (Assassin)
      - Warlock-Augmented Weapon

Core
+Clanrats (30 + 1)
      - Spears, Shields, Full Command
              - Attached: Warpfire Thrower
+Clanrats (32 + 1)
      - Shields, Full Command
              - Attached: Poisoned Wind Mortar
+Skavenslaves (39)
      - Shields, Pawleader, Musician

Special
+Poisoned Wind Globadiers (9 + 1)
      - Bombardier with Death Globe
              - Attached: Poisoned Wind Mortar
+Warplock Jezzails (5)
      - Sharpshooter
+Rat Ogers (5 + 3)*
      -Master Bred Rat Ogre

Rare
+Snikkotto Twitchnose (Doomwheel)
+Gnithnik Twitchnose (Warp Lightning Cannon)

*The problem is that I don't know if I'm allowed 3 or limited to 2 Packmasters. According to the wording, various forums and the FAQ, it seems that you can get an additional Packmaster for every two Rat Ogres in the unit (which means the my option above would be legal?). Perhaps in the next rule book release will better word it

I should have this force ready by next year. OK, perhaps the Rat Ogres could be a problem, depends on who I want them converted. We shall see where it leads. I am to open to ideas if anyone has any.