^ That. I do HIIT for my cardio and that shit is lovely.
Also, I suggest you divide your muscle groups more and spend more time on them during one routine as opposed to doing just upper body and lower body all at once. So start off with chest, biceps and upper back, then do shoulders, triceps and lower back and then do forearms, legs and glutes. Do abs daily and obliques as often as you can, either daily or every other day.