Yeah you're right, water does suit him best - not least because of his affinity for the Teleri too!

Fingolfin would have been such a good brother to Feanor if he hadn't been such a dick, yes. Supportive, talented, loyal, fierce - what more could you ask for in a sibling??