Harry still wants Draco, so it's sort of selfish. :) He explains why he wants him so much in Chapter 2.

And yes, he'll get there. A large part of the reason has to do with him realizing that he could have hired any group of Metal-Dancers, and Harry could have gone anywhere else- even sent his workers without himself.