Hunt for the Dragon Balls
21st Tenkaichi Budokai
Red Ribbon Army
22nd Tenkaichi Budokai
Piccolo Daimao
23rd Tenkaichi Budokai
Saiyan
Freeza
Cell
Boo
My sectioning of the arcs is based on their overall major plot elements and variations in tone. For example, whilst the Cell Arc can be seen as having two or three major sections (#19/20, #17/18 and Cell, or just Artificial Humans and Cell), it still has the primary theme of Gero's creations wreaking havoc on the Earth. The Piccolo Daimao Arc and 23rd TB are separated for the variation in tone, as whilst both have the same villain (or close enough), the former is a race against time to save the world, whilst the latter is a linear tournament arc.
As for where the obscurity that is the Uranai Baba events are placed, I'd put them as part of the RRA Arc, since they wrap up the main plot of the RRA Arc, being Goku hunting for the Dragon Balls.