I've looked plenty and I think I can handle the issues with the controller though it would be better if I could just replace it. I guess I could also get a quality battery pack (Turnigy?) and take apart the cells, but I'd prefer to buy matched loose cells from a known-good brand (Sony, Panasonic). I haven't seen anyone selling matched loose cells though.