Keynotopia and mockingbird/balsamiq made a huge difference for me. I'd like to see more mockup apps (particularly an easy way to create navigable mockups!), so my vote is firmly on #2.