I'd chose between the two approaches- AIO vs. products with fillers. I'll use one or the other but not both.
I don't like the way AIO makes some marring more noticeable so I only use it on basically perfect finishes. If I want that kind of product on an imperfect surface, I'll use Autoglym's SRP and top *that* with a "heavy" wax. The SRP seems to do a *little* (very little) filling and generally looks better than AIO on marred finishes IMO.