I think I figured out what worked for me:
1. I did the GSM to CDMA fix on the phone.
2. I then did the HTC suggested battery fix on my TP2 Battery but not the EVO battery. This is why My TP2 Battery was preforming so well. After testing the 2, I found the EVO battery was still having issues.
3. I then preformed the HTC suggested fix on my EVO battery and all seems to be well. They both seem to be holding up the same now.
GSM to CDMA Fix:
http://forum.ppcgeeks.com/showthread.php?t=124758
HTC Suggested Battery Fix:
http://forum.ppcgeeks.com/showthread.php?t=124820
Hope this helps!!!