This is an old thread, but still relevant. I believe I have found the correct battery for the NiteRider KP-18650-PAN 29 battery. It was $11 shipped. I will confirm once I have it.
I'd post a link, but cannot as I'm a newbie to this forum.