I like both of your itineraries, though I'd suggest adding Säntis peak near Appenzell, and maybe skipping Chur, substituting something like Guarda village for the authentic Grisons flair. Adding the Swiss national park in Grisons would be nice too if you have the time.