i dont know why you didnt liked iphone 
but i also sold mine iphone 4 cuz of the price its insane to invest that much on a phone and previously i used iphone 3gs so getting iphone 4 was not a new experience for me 
but despite all being said i loved iphone 4 ratina display low in size but good and battery is improved to and camera as well but i found videos playback quite hectic task cuz you have to convert it i know itunes do it automatically but it takes time .. but i loved to check for apps no hanging no laging etc
it seems you dont like iphone 4 cuz of lack of customization so i must advise you to go for some Andriod phone
its a personal experience that almost every person use some number of apps on every OS like
Google maps
Youtube
Facebook
Shazam i use it 
Twitter
Email client
Angry bird lol
Talking tom etc
and the basic apps are available in every platform
but it is also true that the quality of apps of IOS far better than andriod except those who are made by same software house or individual developer
excluding iphone 4 from your list as you already own it i would recommend you
Samsung Galaxy S i9000 if you need Super amoled video playback etc but samsung galaxy s lacks flash so it will be little problem to capture some stills in night or dark places despite that SGS is the way to go for you
it is not easily available cuz first it is discontinued you will not find it in warranty there is less possibility to find it with warranty
well
my advise
Samsung Galaxy S
Samsung wave 1 or 2 ( if OS doesnt matter to you )
If you want to try something new then
Samsung omnia 7 ( super amoled with good snapper )
for review you can google it
otherwise you can go for
nexus 1 its for 27k new from home shopping website google it
hd7 is also down to 29k
but
Samsung galaxy s and wave both full fills your all requirements
