Good place to get a replacement battery for Surface Pro 2?

Looking for a replacement battery for a Surface Pro 2 (1601) that went from fine to not taking a charge overnight.

I've looked on eBay, but it seems my options are a mix of used OEM and generics from China.

For those more familiar with batteries ... what likely the best way to go?

from Windows Central Forums http://ift.tt/2EZmZb9
via IFTTT