Depends on how long you want the car for - assuming 3 years or so then just get what you want end enjoy for now. From 2025 onwards I'd say that EV would become the norm and depreciation far more of an issue for fossil-powered cars, but that's a way off.
And S4, definitely. The Macan is nice, but almost all of the SUVs seem to be reverse-Tardis devices. All big and chunky on the outside but cramped on the inside. Anyway, fast estates look cool!