I suppose the Typhoon is going to be the much better fighter once it finally gets the long overdue AESA radar (CAPTOR-E) and Meteor.
I expect them to keep Tornado alive beyond 2030. Look what has been done with B-52s ... flying zombies. The Tornado will keep flying as a bomb truck and a buddy tanker and maybe even as a standoff missile truck.
It's going to take much more than the radar to make Typhoon competive in 2020's. Much of the avionics are getting obsolescent - EW, IRST, missile approach warning system all are in dire need of update, sensor fusion is lacking, there is no fighter-to-fighter datalink and so on.
Eurofighter conglomeration is simply too slow and cumbersome to upgrade the fighter in meaningful ways. Compare to this to methodological fashion France is upgrading Rafale.
Tornado undoubtely could be kept operationally viable until 2030's, question is, will they? Decisions need to be made very soon.