The choice of the license depends on joedoe’s goals, so he will decide based on that.
All the changes that the FSF made in the GPL 3.0 looked very reasonable to me in order to protect users’ right to share and modify the code. The FSF hasn’t changed the GPL license since 2007, so I trust that the FSF will only change its license in the future when it sees some new industry practice (like Tivo) that arises to threaten the four freedoms.