Sounds like it depends on the length of your commute. For a short commute of maybe an hour or so two flashlights like the P7's should be fine (though I would also check out the terralux's people keep talking about). If you want longer runtimes the Magicshine's seem to be a lot of peoples favorites.
For the rear I have multiple taillights. The PBSF is attention getting and has a very long runtime on AAA's. I also like the Mars 3.0 (even though the 4.0 is brighter).