What are you trying to improve?

Hills are great for increasing power, provided you're working your arse off. I like to get about 20 minutes of warmup before starting a hard workout (of any kind). Then at least 10 for cool down. That leaves 30 for intense work. I'd probably choose hills, and do repeats, but it really depends on the purpose for that ride.