NI40 runs longer given the thermal mass. I’d choose it over the XT45.
I had a k30gt and sold that too. The NI40 basically had the same performance but in a size that was easier to hold and put into a pocket. It’s a great light assuming it lasts.