this is a dangerous game.
you should always try to record your drums first, then guitars.
if I were you, I would redo the guitar track.
unless of course there is something out of synch, like your buffers, which is causing the issue.
You could try using Autosnap as Ken mentioned. that's really your only choice.
me personally, I would be doing the track over.
always start with your drums as a base because it has pieces that are quantized to 1/8 notes, 1/16 notes.
those should always be your starting instrument because of small differences. there of course other times when a guitar part is necessary to lay down first. but I typically use that first guitar track as a "Dummy track".
a guide.