+1 on both options, but I find Geosetter supports a wider variety of GPS log formats. The EXIF metadata fields it adds are picked up by Lightroom as well as other programs, so you can take advantage of reverse geo-tagging in Lightroom either way.