yeah I'm almost certain that is what you'd need to do or at least go back to a save just before you trigger the order's arrival and do all of his pup content, that's what I did and while I think you don't think you need to do all his pup scenes first I say do them all just in case