I have been taking all of that into account, after all I did decide to have the motor built instead of getting a stock used longblock for a lot less money.
I would like to give the black one more chance, if it fails again in 6 months then I'll fully commit to the switch. I'm not ruling it out right now though either.