The 7 might require, as you point out, redishing the wheel. Actually usu. a 1 mm spacer does the trick if the chain is hitting the stay when going from 6 to 7 and you don't really need to redish. So I agree, go with 7 and enjoy the xtra gear.