One thing you might try is to build a graphic representing the catchpoint and the location of berm (i.e. the yellow components in this image), then run a template along that graphic that goes back up the slope seeking the corridor features.
You may also consider not using end conditions in the template to construct the slopes, but use some of the Horizontal/Vertical Geometry Tools and 3D Geometry tools (like "Create 3D by Slope to Target") to create 3D elements at the berm and catchpoints, then add those features to the same terrain as your corridor.
