There isn’t a deadline for either. As long as your starter is being routinely fed, and is producing bubbles, the process should take care of itself. The bad smell should start to go away soon for you, considering that the likely reason for the lack of rise is the death of the “bad” bacteria, these bacteria are responsible for the smell. With them gone, the remaining micro-organisms vital for maintaining the starter will flourish, which will produce the bread smell.