i'd pick the bold again, no doubt.
i'm in a situation similar to yours, having the bold and the iphone 3g. it's always horrible switch to the iphone, simply because all this "touch here and there" stuff is so different from the bold. well, i wouldn't pick the storm - the bold hasn't all this touch screen stuff and simply rocks.