I believe it would be foolish for them to fold ILL into G+ at this point while they try to decide what the real future will hold for the product, because they could just as easily go to all ILL as they could to subscription only. Now I don't think that they would have to tweak this product all that much to make it marginally better and keep the same revenue, but I don't know how or if they could possibly put out anything that won't **** off at least 30% of the client base.
Say you keep ILL with the scheduling aspect, but make them $10-20 instead of $7-17, then cut the number of passes offered by 10%. Then you take Genie+ up to $25 per person and cap it so that inventory is not as terrible. That takes care of the financial piece. From there, you allow resort guests to purchase G+ and make their first selection starting at 9pm the night before if they choose. This would still count the same as the 7am selection would have and require it be redeemed or the 2 hours after park opening opening to pass, but you could have lower stress attempt at getting a pass and sleep later if you prefer. I think in this case they should do the same for ILL rather than the 7a/9a shuffle, so there is only one time drop to keep track of. Last, and least likely IMO, setting the ability to replace one pass with another, though it would need to come with a warning that you're resetting the 2 hour clock by doing so.