...after a long wait I found a suitable rechargable battery to replace the worn out one in my Tornado. It has the size (and mounting) of the Typhoon but still can be fit into the Tornado or Hurricane as well.
Have a look to here: http://picasaweb.google.com/tobbbie....eat=directlink
I still have 6 batteries left, send me PM if you are interested - first come first serve. Of course you can order yourself at the distributor as well.
Batteries are all used up now, but see this post for at least something helpful.