Olight x7 marauder vs x7r marauder

So I have the olight x7 marauder coming in for Christmas, I saw after that the x7r is 40% off Black Friday I believe. I did a little reading and didn't like the fact that you couldn't take the battery out easily. I'd rather have the options of swapping fully charged 18650's in. But with the new added stuff I still chose the old x7 before I found out the x7r was going to be 40% off. Will the lumen difference and any other new features make me regret choosing the x7? Just trying to get opinions on here. Thanks guys.. The x7 was a lot cheaper.- blglov