Looking for a great 3.7" - 4" phone to replace HTC Desire

view story

http://androidforums.com – My trusty ol' HTC Desire is starting to show nagging limitations - the sparse internal memory is a constant problem. So - I'm looking for a high-end phone with a lengthy future, that is not bigger than 4 inches. The battery should be replaceable, as I probably intend to install Cyanogenmod on it. Any suggestions? Or should I wait a bit for a better option under the horizon? best regards Chester (General)