Wait for the Pre. I think Apple was caught with their pants down this time. I expect huge dissappointment with whatever huge update that will be coming from Apple. Six months is just too little too late for catching up.
How was Apple "caught with their pants down," exactly?" They're not going to change their product's update cycle just because Palm, of all companies, announces a new product. No doubt whatever advantages (if any) the Pre has when it is released will be blown away when the new iPhone is announced in June. Not to mention any new functionality that will come with the next software update.