Richard, in Motocalc you can "build" the battery you need based on the available cells. For example, the TP 3S 4200 mah are built from 6 2100 cells wired 3 series each, 2 parallel. You should put "Series Cells" 3, and "Parallel Cells" 2 to have the resulting battery.

Remember that you can update from the internet. If you look just for the batteries you should be able to find a TP4000 prolite cell that should work for you. Or you could "build" your "ideal" battery, and then look for something similar on the market.

Regards,

Javier