Diggin' it. Separating form and function is the best way to go. If you want to tackle functionality as well, create a separate plugin (or suite of plugins) that hook into the theme.

See also: Theme authors, please add hooks for us to extend! D: