Okay here is what i did...i called HTC last week and told them that my battery on my N1 is not holding the charge very well and asked (nicely & ignorantly) if the warranty will cover it and the rep just asked me for the IMEI number, my name and adress (for shipping purpose) and said "we'll send a new battery out to you now"...i said thank you very much.
Got my battery 2 days ago via fedex...no problems whatsoever. Luckily i had bought a cheap battery charger off ebay for like $5 from china...yes it charges slow but it works. so I have a spare ORIGINAL battery to use.
I don't like the longer bigger battery cause it makes my phone too bulky.