A7 commercial includes also A6 so you can still upgrade from A6 Extra to A6 commercial. But I would use A7 in you have both because everything that works in A6 also works in A7, plus the added A7 features.