The system does not need to be changed. All of this can be fixed very simply.
1) Give the President of Israel the right to pardon himself for anything he has ever done before becoming President of Israel.
2) Make Bibi the President of Israel.
Hashem Malach, Hashem Melech, Hashem Yimloch L’olam Va’ed.