Hope springs eternal... but given the trends, I wouldn't hold my breath. It's all about "safety" now... as if you were a baby in angels arms. Kinda hard to do while hurtling through space at 60mph next to other 1 and 2 ton objects doing the same thing, and relying on a Human to pay attention and maintain control.... lol, right.
Expect vehicles to get bigger (more "crush zone", more room for airbag deployment), with worse outward visibility (higher windows for better crash protection). They're already overloaded with complex electrical communications systems that will disable the car if the radio croaks (2018 Mazda, sold it while in warranty because I didn't want to foot the bill out of warranty), and add all sorts of distractions... I mean "driver aids". If you're lucky, you might even land in one of the vehicles where if you want to use the key fob that cam with the vehicle, you have to pay a monthly subscription for the service. This isn't through an app, but with the fob... that works Exactly like the fobs on the 3rd gens, but functionality is turned on/off at the vehicle over cell by Toyota based on your subscription.
You might just want to take care of what you have and realize there will never be anything like it again. If you Really love the 3rd gen, you might want to seriously consider picking up a parts car of two... depends on how old you are (spend a bunch of time Now overhauling the vehicle and it'll last 20 years with minimal input.... I'll probably be on the verge of unfit to drive due to age in 20 years so I'm not too worried). Might be a totally different world by then, where ICE vehicles are relegated to approved events and locations only, with large costs to attend.... you just never know.