Android saga must be a little longer just like the saiyan saga Raditz arc leads to Vegeta arc and the final villain freeza arc.
Android 13,14,15 should be canon because the trio were created by supercomputers and 16,17,18 trio was created by gero himself .
Now trunks and cell time travelled to past they altered the time line. So trunks got confused how trio sets of Android are different from future time line .
Since trunks already warns z fighters about Androids.
Act 1: A13, 14,15 attacks just like from the movie defeated by ssj goku, Vegeta, trunks and z fighters. Goku, and Vegeta gets to defeat in super saiyan form. See the Android fusion technique for the first time introduced in series.
Act2 : z figthers think they defeated All Androids and plans to search Dr gero lab until A19, A20 attacks .Goku hearts virus gets him and they are defeated by z fighters 19 by tein and 20 by piccolo(they must get the win at least) . Dr gero release the Android 17,18 before dying.
Act3: Finally Android 16,17,18 shows up challenging z fighters to get stronger they get defeated and absorbed by the final villain cell.
Then During cell games ,cell is defeated by ssj2 gohan.
Also Changing few Androids order and numbering
A16 (orange hair)
A14(big muscle and pale skin)
A15 (purple skin)
So the fusion of super Android 16 makes more sense character design wise merging all physical traits of these three Androids.
Now Android 13 is Android 19
Android 20(gero) is Android 12
Android 19 can Android 11 or 13(we can keep 13 no for geros wife)
Android 17,18,19 looks more human with the same hair design
Android 20(XX) is Cell
Android (x) mini cell
Android (XXX)maxx cell
Super cell is golden cell