Once you have made the staff, enter and clear the whole map in whimshire. I took the teleporter thing at the end to be sure. After that, go to the next difficulty Act 4, quest: Prime evil, Begin quest. Then go buy the next plans off Gorell the Quartermaster. Upgrade the staff at the blacksmith, rinse and repeat.