I pulled the motor and brought it to him, and will re-install myself. They're a machine shop only, no diagnostic/other auto work.
Good point on the 50/50 warranty, I didn't think of that and will ensure what the warranty covers.
I didn't think the rebuild would take me 20 hours, is that realistic? I was assuming 6ish, but to be honest that was 100% guess.