In building your base stock of lighting fixtures, I would concentrate more on conventional stage lighting fixtures than on moving lights. While they absolutely have their uses, they can be high maintenance and temperamental. It appears that the inventory you're speccing here may be inadequate for the level of flexibility you need in designing for multiple shows. You can buy a lot of Source 4's for the price of 1 moving light, so you might consider trimming the movers to gain more
conventionals.