Flickr seems to be introducing more "interesting" features that you can't opt out of, so it seems that I'm heading to ipernity. I like the layout and the fact that you can actually customize it to a degree. The Guestbook seems like a nice feature as well.
There aren't many photos there yet, but I will be transferring "the best of the bunch" there. The rest will stay in Flickr and I will revert the Pro account to a free one in November before the next payment is due.
Here is a slideshow of what's there now. I also added this to the sidebar, so you can always get to my account from there.