Even if they do, one of them is likely going to cost you more than--
-- Mind, the alternative right now, appears to be not more headers, but an entire board spin as well!
This is, however, a valuable lesson, to design based on parts available, not what you guess may be available.

If in doubt... go shopping!
Shopping? Yes, it's a pain. And yes, the pros spend literal hours doing it, too. (Heck, you can make a career out of it; that's a crude description of half of what a VAVE service does!)
DaJMasta's tip about shorted female headers is pretty good. They will never be out of stock (in some form or another), and the modification is easily made.

Tim