Allies have cut back on the F-35 orders too on about the same scale. But no I don't think it was ever planned to replace the F-22. The F-22 is really an interceptor, the F-35 is much more multirole like the F-16.
F-15 -> F-22 + some F-35
F-16 -> F-35
F-18 -> F-35 carrier version
AV-8B -> F-35 STOVL
It is unfortunately compromised in weight by needing to do the carrier role. But on the flip side, the extra strength in the fuselage means they could last a long time.
