He said he'd be on the road a few weeks with MM, don't know if the rescheduled dates at the end of the tour will have any conflict but the two guitar setup is definitely super powerful live.
For the last little bit they have had Daniel Fox doing both extra percussion and live keyboards for various songs. Looks like Deep Six is the only one from TPE, but for this tour and pairing with Slipknot I think the above setlist is pretty fucking solid for the general audience. Opening with Cruci-Fiction and going straight to Angel with the Scabbed Wings is great. I'm reading tons of comments from people who haven't seen Manson in years and are super impressed with the show.