Could you switch the "office and storage" and "kitchen and storage" to make a shared kitchen for both tenancies, and then you could convert the residentials combined kitchen/bathroom into a dedicated bathroom with toilet?
Commercial toilet could be the external.