#2 without a doubt. Who says you can't push yourself as hard when you're in the real world? Just do sprint intervals between lights, etc. You'll have a lot more fun and feel good about yourself to boot. And the extending the ride home idea is an excellent one for more time on the bike.