I am fairly sure I read somewhere that Toyota will finish production of the Avensis in 2019.They have no plans to replace it with a mid priced saloon.Honda have dropped the Accord because they see no market for them in the future.
Ken if you go to 2022 you will be buying a hybrid of some sort.
By the the way I still think it is your water pump that is leaking.
I'm not dead set on the Avensis, but it would be my car of choice,
if the Avensis is not available in 2022 then it gives me more scope
to look at other models like Passat, Superb, Corolla, Etc.
going hybrid wouldn't worry me in the least, but fer me 30K in 2022
plus a scrappage plan I will be expecting a good solid motor.
I have plenty of time to be making up me mind.