Frustratingly that doesn't seem to have solved it (now have 2x ~500MB partitions and 2x ~1.4GB partitions).

Not sure what to try next... maybe a reinstall of the system software?