@scosta You can rearrange partitions. I would use something like macrium reflect to create a clone to an identical disk where I manually arrange the partitions, you can then use that disk for capture in FOG, once that is done, you can deploy it to the original disk and see if everything works.
There’s probably other ways or even faster ways, but messing with partition tables can be scary.