Not entirely true -- if I set the lockscreen to Swipe, yes, the Home button dumps me to the homescreen, but the Power button gets me to the Swipe screen. Something changed at some point, though, because the Home button used to always put me on the Swipe screen.
Anyway, it looks like I solved...