The whole problem is that you are trying to do too much in the ISR, the number of lines of assembly (20) I mentioned above was not a limit on assembly code but a limnit on TOTAL code executed in the ISR. What you are doing should be done by the ISR (re)setting a flag or counter and the rest handled in main.
Have fun,
Erik