Definitely prefer Madeleine.Maddie is just not a given name to me, though it's a fine nickname. I'm also fully over the name Lynn - it's been so overused as a middle name and as a given name, it feels bland and insubstantial to me.
Andrewput a smile on your face - make the world a better place (: