I think I'd rather bore the block .020 over, replace the pistons/rings with the correct parts. It would cost me around 500$ to do that which is less than the short block itself. The cost of rebuilding the short block would be almost 900$ and its not going to save me any time.

I'm going to call the machine shop tomorrow and see what they say. AFAIK it looks like it can be bored out, but I'm not super sure on that.