In an effort to give you more data, here's where I stand with the battery problem.
At work today I was able to get it to charge to 100% while attached to and charging from a Macbook Pro. I think this happened because it was charged to 87% (as high as it will go) when I plugged it in, and I did a battery pull and forgot to turn it back on for a few minutes. It was at 91% when I finally did, and continued charging all the way. It then discharged to 97% or so and stayed there for maybe an hour, during use, then seemed to discharged normally.
I got home and flashed CleanROM 2.1 again, and didn't install anything. It's a clean install. I did a factory reset beforehand. I removed my SD card and wiped the internal SD, just because. I didn't even add my google account info.
I put it on the A/C charger about an hour ago. Battery was at 55% at the time. It's been stuck at 85% for the past 30 minutes. It charged very rapidly at first, then just hung.
I don't mind doing the last bit of charging while powered down, since the ROM overall is my favorite of the current crop, and it's still beta. I just don't think this can be written off as user error at this point. I'd send you my phone if I could stand to be away from it for more than 5 minutes