I did that here:
It looks like s2idle vs deep doesn’t have as big of an effect as I thought it would, about 50mW difference. nvme.noacpi=1 shaves off only 10mW, possibly within the margin of errors of my measurements.
Still, 50mW, over the whole battery life, means two less days battery, so deep is definitely worth it for me.