Since you're already rooted, just go for a 2.1 version ROM instead... Try Fresh 2.1.2, was running it on my Hero until i upgraded to EVO, seemed very stable and not too many problems. Hit
http://geekfor.me/new-release/fresh-hero-233/ - just released new version for Fresh or hit this link and click thru to the WIKI list of 2.1 roms..
http://forum.xda-developers.com/showthread.php?t=674833
Either way, flashing/updating a new 2.1 rom beats locking into the OTA version...