My '09 Cross Comp came with this exact setup. I too removed the bar-top levers, and aside from new housing and cable, everything else remained the same. The elbow seems necessary, so I kept it in the system. I did not have to change the straddle at all, and what you have pictured in the OP is exactly what mine came with, so I'm not understanding what you changed there. Did your Oryx setup not come with a link wire?
Thanks for the recommendation on the pads. The Stock pads are ok, but Kool Stop is where it's at. I have full-size V-brakes on my monster crosser with Travel Agents, and my oh my, the brakes are almost too good. If I weren't so lazy right now, I'd do the same and replace my Oryx brakes on the Cross Comp, but for now, pads will have to do.