Also I thought it’d be important that Walky make a declaration of intent of doing the right thing BEFORE he’s suddenly granted magical powers.  That way it’s a little less “hey i’m the hero because the story says so, despite all logic to the contrary” and a little more “i’m the hero because i act like one.”  It’s a close call, because I still kind of have to fit the parameters of the original story, but I tried to massage that angle in there regardless.  Still sort of inelegant, but you go to war with the It’s Walky! you have, not the It’s Walky! you want.