Not only is CPI calculated with Hedonic Adjustments (the term they use when doing the thing you said they didn't do), those are one of the most controversial parts of the CPI calculation, because they allow CPU GHz to offset wildly inflating health care, housing, and education costs, which is obvious bullshit.