For photos I use Adobe Lightroom for most everything, and highly recommend it for its combination of editing and organizing abilities.
Video editing is a combination of GoPro Studio, and Sony Movie Studio. I'm still learning the ropes on the video editing, so I wont make a recommendation...