That's pretty much the best. One *could* fiddle with the partition tables, making the dynamic data partition larger and such. But it's probably not worth the incompatibility headache.

Cheers