Thank you all for the input. As sound is probably my #1 concern I think I am leaning towards the Avant. Dealers seem to have a big Avant promo right now so my guess is they are clearing stock for an update. So will wait a few more weeks to see what happens.
They did this the last year as well, but yes, it might be time for a new version. I noticed several changes though on my most recent avant 55 from the first one so I think they already made MK2.