Should i buy the droid charge or wait for the samsung galaxy s2?

my current phone, the env touch, is basically dead. i will need a new phone soon but i dont know if i should (or can) wait for the highly anticipated galaxy s2 or if i should go with the droid charge. i really want to move into my first smart phone after being stuck with this for 3 years. i could really use some advice because if i do the droid charge i will be with it for 2 years and if i want the S2 i will have to wait till Q3 maybe longer (due to living in the USA) thanks in advance.