18m for the next FY is quite small, considering the consistent demand. Supply issues will continue for the entire FY I guess. This also probably means the entire first half of the PS5's life will have supply issues.
I could see Sony extending the PS5's life to make up for it, but launch aligned with the PS4 it will be behind for a long time.