The standard Tesla conundrum. What's coming is definitely better than what is available today. But at some point you want a Tesla, right? I've waited so long for my X that I'd probably take one with Flintstone style burning sticks on the front to guide the way...
Plus the Illinois program appears sketchy. Is it only for the select counties? If you make over 50K a year are you ineligible? If you vault the first two conditions, are you willing to keep the car for a long time and not move from Illinois? I wonder how long it takes to get the money. I like free money too, but it just has the feel of "jump through hoops and end up with nothing at the end..."
My opinions only. You probably are doing the right thing on both counts. Heck, we could both easily have to wait for July 1 or later and the new lights because of further delays.