Not to go full nerd here but according to setlists.fm there were 1195 songs played during the tour and 276 (~23%) of which were from one of the 3 recent EPs with Bad Witch accounting for 136. BW was the 2nd most represented album/EP behind TDS. Given their catalog I would say yes, the CB&I tour was meant to promote the EP trilogy.