The vote is currently split, with myself, Damage, Maverick, and KingTempest agreeing, and with Lonkitt, DDM, LordGriffin, and Lephyr disagreeing.
I object to the composite cosmology as the series has an established function through which timelines are created, and they are accounted for in the box of time rings we see, which leaves no room for these non-canon movies or GT to exist (and they were not created through the function described to make timelines) and thus we cannot assume that they have completely identical cosmologies.
@LephyrTheRevanchist offered something of a middle ground where he seems to recognize that GT can't be considered part of a composite by says anything Toriyama is known to have written should be included, which I am perfectly okay with, so that solution could be considered a 5-3 vote perhaps but I'd like Lephyr to clarify so we can get this wrapped up.