I think that you should go for the HTC Desire. Both smartphones offer pretty the same life of the battery and they have similar sizes. However, when it comes to storage space, the HTC desire is the winner with 32.512 GB memory. Furthermore, the HTC Desire comes for lower price than the iPhone 4.
The software features of both smart phones are the same, but I personally recommend HTC Desire.