Yes, though I would rather find a way to just have one headword per etymology.
All right, then I'll follow that format for now.