Adding Calcium sulphate and Magnesium sulphate ( in around a 4:1 ratio weight wise should do the job) to increase GH providing both Ca and Mg. As for amounts, the simplest way is to make a mix of the 2 chemicals and just add enough to the tank until you reach the GH you are aiming for. You can buy ready made mixes but they will much more expensive. If you are already adding plenty of Magnesium then you can just use Ca SO4.
Personally I don't quite understand why you use all those buffers, why can't you just add enough Equillibrium to reach 8dGH ?? It would seem the simplest thing to do. A pH of exactly 7.0 is not particularly beneficial for most plants or livestock. Most have a large range in which they are happy, probably from pH 6.5-7.5 at the very least.