Sounds like you're making good progress considering how crappy you were feeling. If it were me, I'd continue with the pre-exertion albuterol for a while longer. Until no more wheezing, maybe. (Internet forum advice........)