No at this point, the ball is already rolling in the LED world, the HIDs are just getting discontinued voluntarily since they don't sell these days. Everyone has LED fever and that alone is doing the damage now. The bans in the past were just a push to help get this started.
Agreed, HID and fluorescent have been dying a slow death since the mid 2010s when mass conversions to LED and more importantly, the use of only LED for most new installations really took off. With less demand, the manufacturers will start to discontinue low demand and low margin products.
Granted I have a feeling most HID and fluorescent will get cut in five years dues to mercury concerns as the reason.