I did the same, it was a realy mental battle over getting everything I wanted and keeping the cost reasonable. It came down to the fact we use it mainly as a tow vehicle behind out Motorhome and a fun run-a-round on the weekends. I'd still have the TJ if it hadn't gotten possesed by an intermittent gremlin! I felt I was just throwing parts at it because no one could diagnois the problem. I couldn't, in clear conscience, sell it to an individual with an intermittent problem, so we traded it for the new one. Figured the Dealership was better equipped to fix it before they sold it. Anyway, cost won out and we found one with what we felt were the must have options, (connectivity, towing, and gears) while keeping the cost to less than I got for the Prius I recently sold. So, the trade value we got for the TJ was actually cash in my pocket.
We looked at a Black on Black Rubi with the same options you're getting. It was really tempting, but in the end, we went with the Sport. Since adding the 17" tires and wheels, I couldn't be happier! Looking forward to seeing some pictures of the Commando Green when you get it!