So essentially the battery move was made because it was getting a bit warm, which isn't a problem on the R22 since the battery (if it's in the engine compartment) is in the free flow of air, and the engine is smaller.
So how about losing a bit more weight and putting a few ducts in the fairings ? Or am I being simplistic ?