Well, it ain't perfect but maybe marginally better. Neither of the traps is vented though you could have put an AAV on the top of that double wye fitting. The CI is still not the correct fitting but I can see why perhaps you didn't want to go messing with it. So, to sum it up, better, not perfect but it will most likely serve its purpose. I would add the AAv though to keep the trap from siphoning. A double San et would have been a better choice because a wye can put the trap weir above the wye inlet causing the trap to siphon but in this case it appears that it will be ok.