I agree with losing one or the other of the shirts, and one of the longjohns (assuming they're full-body).

Doing something about your foot insulation and wind protection is pretty important. Your extremities are the first things to potentially suffer from frostbite. What were you wearing on your feet?

Edit: Adding some kind of windproof shell will likely do a lot to improve your sense of warmth on your torso if you go with less actual insulating clothing.
Edit edit: Actually, the Showers Pass jacket probably qualifies as windproof. Cutting down on torso insulation is probably a good idea.