I wouldn't write the F35 off in a fight with the F-22 just yet. Until fully upgraded, (and maybe not even then) it has nowhere near the situational awareness of the F-35, and the F-35's stealth is a newer generation. The F-35 will know where even F-22's are before they know where he is, in most situations. The bad press of the notorious F-35 vs F-16 dogfight was based on a total misunderstanding of the conditions. The F-35 was severely power and aero restricted in that test, being a development aircraft that had was electronically limited to lower G capability. Today's "unleashed" F-35 would be a match for the F-16, and if the gloves were completely off, with all advantages available, the F-16 would have died not knowing what hit it or from where. There was an Air Force pilot with over 4k hours in the F-16 that transitioned to the F-35. He said he'd take the F-35 in ANY scenario over the F-16 if he were to go into combat today. In fact, he said he'd take it over anything else flying, including the F-22, because of the situational awareness. He who sees first shoots first. It is that simple. He said the F-35 sees everybody first, by a wide margin.
The good news is that the F-22 and F-35 fight on the same team and compliment each other. That's bad news for any potential foes. It is also bad news for Russia that we have hundreds of F-35s now on the flightline and an entire wing combat operational (just the Air Force), in addition to Marine F-35's that have been fully deployed on assault carriers, when they don't even have a single SU57 operational yet.
I do agree that it was a huge mistake to end F-22 production. It would have only taken $600 million a year to keep the line going, producing 6 aircraft per year. That's an entire squadron every 4. Dumb move by Gates and Obama. They have all the tooling in storage and could theoretically restart production, but the cost is just prohibitive, especially for a design that old.