T-Mobile V-Day sale: Amaze 4G or SGS II?

I am torn between two great phones, does anyone have input on which phone I should get? I'm leaning toward the HTC Amaze 4G, since it has better pixel density on the screen, and supposedly the better camera, but I can't help but wonder if the SGS II is going to be a better phone in the long run. Any owners of either of these handsets have any advice to share?

I will be putting an ICS AOSP build on my phone as soon as they are available, whichever phone I get. I guess it's a toss up which phone will get a stock ICS update first.