Can you nest this within the first conditional?  Also both this and the top conditional you AND which means you either have both roll and yaw input < threshold or _both_ above threshold.  Is that what is meant to go into the middle conditional block?

The way it is grouped makes it hard to see what you are trying to get in each case.  For example if roll is not in ATTITUDE mode or based on the input values.