What a great workout/day! That routine you did sounds a lot like what I often do, except for maybe mountain climbers -- those can be tough. :) Until recently, I would only use the various kinds of ellipticals for warmups, but I've spent a couple of 30-minute sessions on them and enjoyed it. Overall though, it sounds like you're on a great workout plan!
I had the great fortune this week to catch two spin classes with a live instructor for the first time. I missed the start, but caught the last 30 minutes each time. It was all the awesomeness! I now find myself looking forward to the next spin class each time!