I think your trade to Miami makes the most sense... Make it NWG (instead of TB) to Miami and put Mudiay to Minny trade (it will happen) - It get Miami all the way out of the tax... they can save about $10M in total. They just put KO or James Johnson in for Leonard. Bam is the real rim protecting center.
I don't know if Leonard makes us better, but I think its a different look and opens up some space to safely use our exceptions last year. I think they'd do the Olynyk deal too, but I'd have to have Bradley in on that one. We'd likely be tax payers if we use the MLE and re-sign JC... I'd be fine with that as we'd likely duck the tax the next year and aren't really going to be in the repeater tax. We've stacked enough money that it shouldn't be a huge concern.