I'm am very certain that like in the Past however, the USAF will badger Congress into expensive upgrade packages for the Raptor, especially at the expensive programs already bought and paid for just to bring it into existence, at this point it would not makes sense not to.
The Raptor will only get better over the years, as new components are place in, and newer and better offensive and defensive systems are developed , but that will only be seen with time. I am positive an F 22A of 2005, will not be as sharp as an F 22 B, or C or whatever model of 2014.
Expensive jets in the USAF are like wine, better with age.