If you're having trouble with overlaps in xip, you can do what I used to do when I was being lazy and wanted to port in new drivers to xip..
use xipporterex and feed it the same input and output xip.bin
it relocates everything properly when you smack the port it! button
