Personally I don’t think the issue is with the facing of your bottom bracket, but I’m no expert. I’m betting the problem is only with the team cups? I’m guessing you didn’t have the problem with the xr ones? I only have this specific problem when using the Team BB with an older stylo crank. I feel sure the axle design has changed slightly.
Bearing life on my current team BB has been excellent, even with the bodge.