They're both grammatically acceptable but not as clear & efficient as they could be.
I would favour option 1 if explaining to a child, or someone who is struggling to understand, especially if I'm in no hurry. Option 2 is better for official formal usage where time should not be wasted, as it's more concise & tidy, but requires a slightly higher level of English to understand.
Your guess is correct.