You almost got it right. Maximum battery current will occur at maximum power which will be at maximum torque, but will be less than maximum speed (unless you're geared way too high (low numerical...