Well, I got the schematic redone for the DIP, added solder bridge fields to route I2C or A4/A5 to the shield header.
Can change the solder bridge things to pins when I see that it routes okay, same with moving the crystal a scooch and pulling the DB9 off.
Will look at the header spacing also, can move if the db9 is gone.
USB change as well.