I used the ClickRepair app - it cost a little but produced excellent results - and saved me a lot of time doing the manual type repairs that you are doing.
See this sticky thread: https://forum.audacityteam.org/t/click-pop-removal-clickrepair-software/1933/1
WC