I have got both set ups across my birdies. I payed a silly amount of money for a ccn bolt that replaces the chain catcher like the secound one. It does not work really well as regards stopping the chain coming off in the fold but its ok on a spare bike. At least it does not jam the rear cogs up by bending in to them.
For regular folding I prefer the new birdie chain catcher. Its standard issue on new birdies. I dont know if they are also fitting a shorter cage rear mech?

As you don't need a long low cage with it fitted.