Seems like the obvious thing to do is the 1 year extension on the lease. Presumably that continues the $200/month payment that you're carrying right now. My Sig # is 184 - I figure that with luck, I'd be taking delivery in late summer (September), with fall much more likely. Admittedly we'll both be early on in the production sequence, but anybody who tells you that they know when first delivery will occur, or what the production rate will be (from which you could project your own deliver), that isn't in the form of an official Tesla statement good for public investors to use as facts for investing purposes, is just making stuff up
(Like me, above when I included my personal estimate of when I hope to see Model X - making stuff up).
Another way to look at it - 1 year @ $200/month is $2400. Month to month rental at $500/month only needs 5 months to roughly break even. That means somewhere in July or August of monthly reservations is when you break even by avoiding the year of lease, and after that you're losing money. Keeping the lease for the full year makes it look likely that you'll have the Model X well before the lease is up. From there you can look at options to get out of the lease early. You can also view the Leaf as a second EV for other family purposes, even if it's not being used frequently. Since the Leaf is effectively free (lease/rental payments) starting sometime in the Summer...