Tartan has a good idea!
Would it work if you straighten the border according to the print... trim off what you need to, then sew that to the border lining things up again? You'd have a seam in the middle of your border, but it would be straight.
Like you, things like this take up all my mind space still it's resolved. Let us know what you end up doing.