Are you doing the main bearings etc? Don’t forget the crank thrust bearings.
Best to do everything you can while you’ve got it stripped. No point having to do bearings in another 20k miles.
I just rebuilt mine with new pistons and rings, well, everything really. It runs perfectly and I hope...