The may thing that makes me think otherwise is that if you're right there was no reason not to solve this issue in TGS right away, in the climax of the book.... One short scene and this was done, and would have fitted very well the book's climax. Instead, Brandon/Jordan planted the seeds of problems between the two. In the past of the series, whenever Jordan planted the seeds of interpersonal stuff it was because he intended to use it later, not solve it quickly behind the scenes or in the next chapter.

That's why I suspect there's more story to tell than just "I forgive you, now get on your knees that I bond you".

As for tedious... well, that's really no surprise with Gawyn's story line.