I agree with almost everything you said except I believe there is pretty compelling evidence that Tenaya was Yokut not Miwok. The direct descendants of Tenaya - of which I happen to be one - listed on their applications to the BIA that their Chief, Headman, etc were Tenaya, Bautista and Cypriano. Although Tenaya himself did not sign a treaty, historical writings indicate that his associated tribes were all Yokuts (as the broad classification is applied).
The May 1, 1901 article by D. J. Foley reflects that the Ahwahneechee were referred to as the "Digger" tribe, separate in identity from the Paiutes, and in fact the Paiutes were enemies. After this the Ahwahneechees were labeled as being from the Miwok group in census and articles however as I stated above, looking at the tribal affiliations made by Tenaya a logical conclusion was he identified with the Yokuts.
Jean Nicolas Perlot's book is a good source. The Tuolumnes - although there were marriages with them as well as the Paiutes - were enemies. The Tuolumnes were Miwoks.