I'd say that's the perfect solution, if you don't count how the others in 'wrong' Harry's world would react. Hermione and Ron especially, though they were a bit of a busybody in this fic, don't deserve to have their best friend replaced by soggy noodle. Maybe Draco can follow Harry home instead? He'd have to give up his star status, at least until he settles in, but right now he seems to not have emotional attachment for anyone, so...