For the time being I am still considering how to analyze Torquatus and whether that section is Cicero slanting the argument or is in fact an accurate summary of the Epicurean material that Cicero was supposedly copying from for his own book.
I tend to think "both" -- I tend to think that this was the way that Cicero thought, but I also think it's the way that the later Epicureans were drifting in response to Stoicism. Something similar is cited in Laertius about the other Epicureans having a "fourth" leg of the canon, so it appears to me that by the time of Cicero there were in fact important divisions within the Epicureans.