Aid: that longer pitch is only partly aid. Also, you don't need a big wall rack or a tagline. You could aid the climb with a standard rack of single cams, but if you prefer to haul in more gear, don't let me stop you.
Diagonal: just focus on getting to the Diagonal itself. If it's your first time, chances are you'll have a hard time figuring out which start you did.