Like I said, I originally planned to use those Emoli cells. However, I forgot I could use those LiMN cells over at Boom Boom Batteries. Those will fit too I guess. So, it looks like those are my only two choices.
I've looked thoroughly at Maxamps and BoomBoom. Any other good places to look?