I wouldn't count on seeing Angelus any time soon considering we spent all of last season with Angel as Twilight and he is spending this season redeeming himself.
Yeah, we don't even need Angelus now, Angel is messed up enough as it is.
Is the happiness clause even still in place in the non-magical world? Even if it is, I doubt that Angel is in any danger of getting perfectly happy any time soon. And the possibility of someone removing his soul through a magical ritual is off the table for obvious reasons.