I won't buy another M3P whilst it has the same battery pack as the LR. It's such a significant, costly component that has a fundamental impact on performance, range and charging. Mine was bought when they were £10k more expensive and I was fine with this.
If I had to go out and buy another...