Hi cfiggins,
Regarding Stage 1 preparation, I don't have much advise. You have already taken it, so you know how it's like. There are similar exercises available, but I can't help with specific exercises to improve your results.
As for the waiting time, I can say I passed Stage 2 on January 2014 and still waiting for Stage 3... which doesn't seem to be taking place anytime soon.
Good luck!