Have Calibre on standby, too. Be sure your ebooks are in ePUB format. If not, you can convert a bunch of different formats to ePUB with Calibre. You might also want to change the port forwarding rules on your router so you can access the Calibre server over the internet. For that matter, you might want to open a DynDNS or similar account so you have a static address (e.g. mybooks.dyndns.org). Being able to access your entire ebook library anywhere you have 3G/EDGE signal is awesome.
Can't think of anything else at the moment. Enjoy your iPhone!