I put my vote in for interval training. That sounds like a great plan
But... work with your body. If you're tired one day, take the intensity down a bit, or break up the workout into shorter segments. And if you've got extra energy, take it a bit harder. Your body will tell you if your workout is too hard or too easy so listen to what it's telling you!
Treadmill sounds very cool as well, I'm jealous