Yes, I, too. I think Tocharian is clearly pre-satemization, which in my opinion was a mid-late Yamnaya phonetic innovation that probably swept, in different degrees and ways, all lands that were in or near to the PIE core territory. I still think the association between Tocharian and Afanasevo may have sense. Anyway, I don't think it's right to say Tocharians were "genetically Andronovo" until we have probable early Tocharians (that will be hard to establish, as Indo-Iranian and Tocharian were presumably in close contact for a long time, the Tarim Basin also had lots of Iranic speakers).
How would one identify a Tocharian though? I think the first attestation is dated to 300-500 CE.