If you haven't played with emacs-refactor yet: https://github.com/chrisbarrett/emacs-refactor it's well worth your time. E.g. emr-el-extract-to-let is invaluable.