That was some sloppy engine work, glad you are with an experienced shop now. I've seen cam wear like that when not using the proper ZDDP oil.
Once these mag blocks have gotten all the proper updates they are quite reliable. Line bore, shuffle pin time serts or case savers. Worthwhile to upgrade to a later oil pump too.
Are the CIS pistons compatible with MFI? I thought they were different.