I'd vote for the Haro over the TREK any day, and especially for this type of bike. Trek's history has been predominately lightweight XC and Road bikes. Haro's history is BMX and strong Mountain Bikes. I have more faith in Haro's being stronger that Trek's.

I'm still a bit confused as to the '04 and the parts mix you ended up with. Was it a bike the shop got in and then swapped parts out or what exactly?

Also are you doing more DJing with the bike or more FR? If more FR put the better brake on the front, you should do a majority of your braking with the front. If DJing you don't use the front at all.