Agreed that is the direction I would go. The only reason I can think to wait on a rebuild would be if one knows/trusts the mechanic and/or they are having modifications done to the engine for cooling, turbo, fuel efficiency, brackets for different accessories like dual alternators, computer tuning after removing components from the engine, etc...