I don't think BJ is a true welterweight either and I think they’ve both improved but GSP more so. I give the edge to George, If he fights his fight (strength, wrestling, cardio) he should win.
BUT
If BJ can somehow turn this into something other than a wrestling match...