G'day Andy...i managed to get hold of this battery...however, it is an incredibly tight fit!! the issue is that it is so long that it pushes against the plastic tabs near the switch...I'm not that comfortable pushing the battery to make it fit...I did so only very gently, and it does seem to finally get there.
Did you have similar issues, and if so how did you solve? I'm thinking of melting a bit of the plastic near the CREE holder on the other end just to make a tiny bit more space...this should work, but I think it's worth mentioning to anyone else attempting this fix that this particular battery only JUST fits, and it would be better to use a battery that is, let's say, a few mm less long...