You will need to restructure your code using millis() to keep track of time rather than delay(). Also I think you would benefit from using a state machine and it would make it easy to add functionality later on as well.
Look at the following tutorials: