Aaron Chaim’s question won’t occur again until 2020, when Rosh Chodesh Iyyor is on actual Shabbos. The again 2023, 2026, 2027, 2030, 2033.
However, if you are in distress from not shaving, there are Heterim to shave on Yom ha’Atzmaut, but I don’t know if you Minhog Aaron Chaim is to hold Yom ha’Atzmaut BiZemano next Friday? or Mukdom next Thursday?