I finally had it with the goofy mechanical problems associated with revs 1 and 2. This solves almost all of them. The board is the same footprint as the battery and the touch controller. The display is now 16-bit color, the GPS is on-board the main PCB, and the PMICs are all upgraded.