Yes, a second or larger battery is the answer with your present bike, enabling you to use your powerful motor more liberally.
Before you commit to a Kalkhoff instead, bear in mind that a crank drive bike like that is very different from your hub motor one and can also entail a lot of work in...