Both are on my list as well, but the idea of finishing in Zermatt trumps other highlight on TMB.
Consider also the Via Alpina, which I have done a few years ago, through the heart of Switzerland, massive mountains, tiny villages, & non-stop scenery that will spoil your hike expectations forever...