Except that last paragraph. Rather than having to change the pixel dimensions back manually after changing the dpi, just make sure upon opening the 'Image Size' dialog that the 'Resample Image' box is unchecked. The pixel dimensions will then be locked.
Well I'll be a monkey's uncle, I didn't know that. Thanks! Man, after all these years, I'm still learning nifty little tricks.