Quick Emacs tip: `comment-dwim' got you down? Try changing `comment-style'. I have mine set to `indent', and am very happy with the result.