The US should do what the UK does - offer the extra months on your new passport (so you don't lose out with '6 month' rules). I always ensure my passport has more than 6 months on at any time, to avoid these issues, and the UK just add the months on to your new one.