I rebuilt my motor myself. Used 2 stock new pistons, all new rings, ball honed the cylinder walls, and slapped it all back together. We really don't have anyone we know to do machining that is local. The guy I would have do boring, knife edging, etc... and all the machining work is Mike Smith and his machine shop. I would have him do the machining and I would put the motor together. I may be doing this late this year? We recommend new factory shortblocks from Nissan. No problems from those babies. You know they are gonna hit all 6 and not miss a beat.