The way you used to do it (the 1st set of load cases above) is always correct.

The 2nd set of load cases above is correct IF the piping system has only linear restraints. As soon as you introduce non-linear restraints this 2nd set of load cases may be inaccurate.