Correct me if I am mistaken, but I believe that in 6th ed. You can take double the force organisation if you are 2k points or above, so if you wanted, you could have double the amount of wagons!

(because enough, is never enough!

)
Not that that's the best idea. I agree with what's been said already, your nobs squads are too small. Consider consolidating them into larger squads and having some B-Wagons empty.