A likely problem with "GPLv2 or any later version which has [feature list]" is that then the "[feature list]" itself turns into a licence, with attendant complexity of text etc..
A simpler solution perhaps, if you don't fully trust the FSF, would be to add additional authorities as to which later versions are blessed? E.g.: "GPLv2 or any later version approved by [authority]", where authority could be, say, Linus Torvalds, or some cabal. ??