Always the 
Mini 2SE that is coming to Walmart.  Maybe even Costco with a decent price.
I see no reason to upgrade from a Mini to Mini??? unless some great new features show up.
Best to move up to the 
Air2 /
2S for the exact reason mentioned.  OA, 48MP camera, 4k video, and more.  Sure, it is 2-3 times the price, but my 
Air2 makes my Mini look like a Parrot Nothing that costs maybe $50.
I have kept my Mini for 1 reason.  To take overseas / out of country and be able to fly without all the restrictions that CE and others have like here in the US.  Otherwise, why keep it when I have the 
Air2 and all the awesome features and great flying it does.