I believe you're correct (or, at least, we've read the same list somewhere). However, I have a question as to the abilities of some of these settings.
What would the heat setting do to living tissue? Those rocks in "A Private Little War" looked to be glowing pretty hot. Perhaps Heat and Kill are the same?
Could the invisible cutting beam be one of these other settings like disrupt, only with a narrow focused beam?