He should use his magic to somehow make a clear distinction between his magical girl self and his real self. If it was left alone as is right now, soon his magical girl self feelings would get stronger and might become strong enough to overwhelm his real self consciousness. Feelings are the forte and the source of power to magical girls after all.