My dad had this happen not to long ago on a new truck he bought. It was all well and good and nothing bad happened until the first service. The dealer, without telling my dad, installed some update to the computer system and after that the truck would do exactly as you stated. It would not rev over 2k and would take a loooong time to accelerate. After several trips back to the dealer they finally told him about the update and said it was a factory directed modification to improve fuel economy. But it really screwed up my dad's truck. They claimed they couldn't undo the modification but did install a new ECU that was "clean" and that seemed to fix the issue. Still though my dad traded the truck in a few months later for a different brand.
I hope you can get it straightened out. Sounds like a real PITA.
Ford did something like that with the 6.0 diesels. They took out some hp to
attempt to make the head gaskets last longer