An SWM16 will only work with four lines from the dish to the SWM16 (not two), and then two lines out of the SWM16, with a maximum of eight tuners on each one, so you must be mistaken about the setup in the old house. If you had nine tuners active, you must have had an SWM16, and that means there must have been FOUR cables from the dish to the SWM16. If the SWM16 was placed outside, then there would have been two cables into the house from the SWM16. The recommended configuration would have one of those cables driving the HR34, and the other connected to a four-way SWM splitter driving the two HR24s and the power inserter.
It sounds to me like you and the installer for the new house were not communicating very well. If you needed the SWM16 to be in the media closet he would need to run four cables to there from the dish. If you insisted on only one cable from the dish, then there would be a single cable from the dish to a splitter and then you would need to run one of the HR24s in single-tuner mode, which sounds like what you have. With the limitations you apparently placed on the installer, he did not have any alternative.
As far as the costs of the genie and client are concerned, you are on the mark with the "list" prices. Many people get the setup for much less, and as you say the movers connection is the best time to get a deal if you are an existing customer.