Under Settings/System/Power&Battery, section Lid and power button controls, I set the power button to Hibernate, but I forget if you have to do something first to enable Hibernate as an option. It makes the machine power down completely but restore your session's status on restart, just like Sleep. But I don't use it now for two reasons (a) I got into the habit of hibernating my Pro 7 because if I just let it sleep while plugged overnight it was still hot in the morning, and that doesn't happen with the new machine (b) restoring from hibernate takes MUCH longer with the new Pro than with the Pro 7 for some reason. So I just shut the lid now and use Sleep. It uses a negligible amount of power.
As I said, in the scenario you discovered (which sounds a little awkward), are you sure that sequence of events doesn't leave the machine in Sleep status? That would make it restore immediately on raising the lid, so it's easy to distinguish.