Hero vs EVO advice pls

[Mr.Gadget]

OK. I am growing tired of the sluggishness of the Hero. I have flashed to 2.1.2 ROM and really love it, but I think the Hero is a bit under powered.
I am itching for the EVO, but I am REALLY hung up over the $120/year fee just for the ability to own one. But... I am wanting MORE SPEED!
Will Froyo help on the Hero or should I quit my whining over this nonsense fee and get the EVO? (It became even harder to resist the EVO today after I saw the new iPone 4 specs and features).
So, would you go EVO even with the bottomless fee?
I have been fighting this fee tooth and nail, but now I am weakening for something nicer...