Partitioning is terrible, indeed. You can change some things around but you're stuck with the VFAT partition as some apps will refuse to work without it.

Should have been rootfs 1 GB/ rest 31 GB both ext3 with some sort of translation driver for mounting on lesser OSes (read: windows).

The exact moment there is a fix for apps working without VFAT im partitioning the whole thing to ext3.