Hi, I am in almost the exact same situation as you are. I stop using A6 Extra a few years ago and decided to get A7 a couple of days ago.

From what I've seen so far, A7 definitely seems superior although it is quite hard getting into things again which is probably due to a combination of A7 and the fact that I've been away so long.