If I were going to totally reorder her I would consider doing something like:
Extension: Bfly MKB daedalus divine
Luxury: manta satanic BoT
...just to make it clearer that manta shouldn't be bought until very late. At the end of the day, though, she's just very difficult to cookie-cutter.