I'm inclined towards Cave Story+ on Steam. I think it does a great job of pretty much everything. The fact that it lets you choose between the upgraded music and graphics, as well as the bonus content (Wind Fortress!) makes it damn near perfect. Considering it's on PC, letting me use my PS3 controller for it is a nice bonus, too.