Just to expand on what I posted above, IMHO, if you spend some time addressing this at mix level, the less work you'll have to do when it comes to mastering the track. You won't need to be so heavy handed in getting the 2 sections to mesh together properly.
Are you working on a 2 channel "pre master" or are you still working with multitracks?