I'd say both.
Make a light batch of aya, but with full MAOI inhibition, and make some weak changa, like 1:4 instead of 1:1, especially if you don't have a milligram scale, so that you can roll cones or pack a fat tobacco pipe with changa, and puff it throughout the journey if you want to blast deeper.
Like lets say you have a good powerful cielio caapi, take enough caapi that with the caapi alone your stoned out of your mind, with only your basic motor skills left. You have to be able to feel the caapi spirit's approval before you can continue. Then take like 1g or 2g Mimosa or equivalent, just enough to get the visions nice and colourful. Have a tobacco pipe of weak changa by your side, and puff it when you feel ready for a mind blowing adventure.
Later you can up your mimosa doses, and strengthen your changa, if you feel it at all necessary. Remember, if you can get where you want to be with a smaller dose, that is better. Go for content, not dosage. There is no use in going into an experience that is so intense that you cannot let go and appreciate it. I learned that the hard way.
PS: Don't take my advice on oral dosages to seriously, I haven't done oral yet, this is just what I gather from all that I've read. Possibly you'll want more mimosa, possibly no more than a gram. But one fact remains, you want full MAO Inhibition. What I am trying to convey is you want a full ayahuasca experience, with not much base light, using changa as your main source of light, as it is unlikely to last longer than 20-40 minutes. Again, I do not know how long changa will last under full MAO Inhibition, that is why I recommended weak changa.
I can say that 1:1 changa is really powerful, so powerful that I am glad it didn't last longer than the 15 minutes it did, with the 1 hour equivalent to a 5g mushroom trip that was in comparison so weak that I could absolutely ignore the fact that everyone faces where morphing into infinite fractalesque patterns.