You probably only need 1 baffle between return pump and cheato. I would put 3 baffles in between skimmer and cheato to act as a bubble trap or you could add another one between return pump and cheato.
A bubble trap has the water going through the bottom so the air rises to the top and therefore doesnt pass through (well thats the theory lol). I dont think it really matters where you have the trap aslong as it is after the skimmer section. You could always have 2, 1 on each side of the cheato section.
Just remember there is loads of different designs out there, one isnt right from the other. Just make sure you are confident and that it will work, there is no set rule