I've had to think about this. I'd go with a Noldor unit, although which one I'd choose is the difficult part. I thought about the Houses of Gondolin and the mounted archers of Hithlum, but those came to a bad end. So I would choose to lead a company under Gil-galad's host. I'd go with cavalry if the Elven host had one at that time, but I'm okay with infantry otherwise.
I've had to think about this. I'd go with a Noldor unit, although which one I'd choose is the difficult part. I thought about the Houses of Gondolin and the mounted archers of Hithlum, but those came to a bad end. So I would choose to lead a company under Gil-galad's host. I'd go with cavalry if the Elven host had one at that time, but I'm okay with infantry otherwise.