Great to hear of your success. Perhaps it may be a different brand. Hope it goes forever. Do you charge after every round? I worry frequent charge cycles may diminish the life of the battery.
Had a friend of a friend who went the route of retrofitted wheels. The longevity of the battery is questionable - less than 18-hole range after only one season. MGI Navigator is the best route to take if affordable.