Sure, DigiKey stocks both types of headers -- the original and the one with the two plastic pegs to mate with the empeg board (dunno if the hole spacing lines up or not, though).
Problem is, the header pads are very very fragile (from stress already inflicted), and removing the existing header is thus far more risky than simply reinforcing the existing solder joints.
In any event, a low-temperature iron is *essential* when fiddling about with this, as too high a temperature (most irons) will simply delaminate more solder pads from the main board.
Cheers