Depending on whether you want a distro that removes all non-free options from the start or one that gives you free options, or ways to only select free options, I'd add Gentoo to that list. Much like in other situations, it gives you the choice to have your cake and eat it too. You can select a list of licenses you want (with certain predefined sets), and override that list on a per-package basis if you want/need.
Here is a Guide/Wiki-Article.
I'm using VCSH, which allows me to split the home directory into multiple git repos without worrying about symlink consistency (like with GNU stow) or apps that have problems with symlinks.
The syntax is exactly the same as git, only that I do (for example)
vcsh emacs add -pinstead ofgit add -p.