calculating total power consumption with LDO vs switching regulator
Yes, you have it correct in the two equations for total power consumed from the battery. 

There's typicals and maximums which are a bit higher than the typicals for Iq and a bit lower for efficiency, of course, and the efficiency could vary if you use a different inductor or other conditions vary.