I tried making your changes in the screenshots above and “maybe” its slightly better but still getting weird artifacting and especially when looking at them from above.
Can you confirm that for you it appears fixed and maybe I just need to find the right copy to modify ? (I was using the Megascans Tree’s one since I could easily test)