When I grow up, I am going to be a doctor.
Is this sentence correct? Personally I think my growing up will happen in future and "I am going to be a doctor" sounds like it is going to happen in next month! But the sentence clearly indicates the speaker is a child. So according to me, "I am going to be a doctor" should be replaced by "I will be a doctor". So I think a more clear sentence would be
When I will grow up, I will be a doctor.
Is my concept correct here?