My Simanim Tikkun does have seven aliyot marked in V'zot Habracha (the sixth starting at "Meona", and the seventh at "Vaya'al Moshe"), but perhaps this is because it is the Israeli version of the tikkun. All other tikkunim I've seen (in Israel) have seven aliyot as well.
The custom I've seen, when Simchat Torah falls on shabbat, is to indeed add an extra aliyah before Chatan Torah (making Kol Hana'arim start from "Meona"). It really isn't necessary, as just the normal aliyot are seven+maftir anyway, and in any case, far more than seven aliyot are read; I think it is more of a way of marking the chag that falls on shabbat as special, to add another "shabbat" aliya, as we do on other holidays. I think I've also seen times when this wasn't done - mostly because the community wasn't sure what to do, and the custom isn't 100% clear. The Mishna Berura doesn't discuss this point, though it discusses Simchat Torah reading both inside and outside of Israel, and outside of Israel on shabbat.