I think you’re right in that the Pro will resurface. Read some scuttle butt about the Lexus 5.0L V8 as a potential engine for the Pro down the road.I have heard the same rumor, they already did that once, in 2018 there was no Tundra Pro so they could push the sport model. I foresee them doing this again to push the new trail models. Personally I plan on staying with my 2017 until the wheels fall off. 2018 and up have the TSS stuff, so many more sensors, radar etc to go bad. The 2nd gen like you have was the one to go a million miles and the one to pull a space shuttle
You brought up a good point about TSS sensors. I got plenty of time to ponder the next purchase.