My guess is deal or no deal, tariffs are going to be there 1) to persuade China to speed up the process 2) China cant be trusted on any promises written or otherwise.. Considering recent last minute reneging from China, chances are Friday's tariffs will be increased anyway and further increase on rest of the items might be postponed, if there is a deal..
If China somehow manages to make a deal with all tariffs removed, will be a big victory for China and Trump will be a sore looser without any leverage to persuade China to fulfill promises (Same as things promised as part of WTO deal years ago).. Bottom-line is if US wants to contain China's supremacy and wants pie of largest market in the world, its now or never (In fact its already too late)..
Finally, if these was all only for theatrics and eccentric Trump is satisfied with short-lived deal-making glory without any tariffs, my money will be on China..