Yep the tooling for the F-22 was lost evidently.
Rich, I think the main difference between the F-22 and F-35 is that the F-22 is a pure air superiority fighter whereas the F-35 is more of a general role fighter.
Once again it seems the Air Force is betting on not needing elite dog-fighting capability for future conflicts. I'm sure some here remember how that assumption worked out during Viet Nam when they scrambled to put guns on the F-4 because the higher tech options weren't always working out the way they thought.