XPS M1530 Battery & Charger

OK, the important stuff first: XPS M1530, 4Gb Ram, Vista Ultimate SP2 x64, 320Gb hdd, DVD-RW, 1920x1200 HD screen, 6 cell battery, 3yr warranty (23 months left)

The issue:  A couple of weeks ago my wall charger wouldn't do anything and then started to making a high pitched whine before coming on.  I thought nothing of it since all I did was unplug it and plugged it into another outlet.  Then, last night I shutdown my laptop (on the charger @ 100%) and this afternoon I started it up (on the battery).  Almost immediately after logging on, it shuts down, so I push the power button and logon again.  The low battery charge warning pops up saying I've got 3% charge left :emotion-40:.  Thinking I may have shut the lid before it completely shutdown (pretty sure I didn't since I wound up all the cords first), I plug the wall charger in.  It starts charging for a couple of minutes and stops at 7%, no warnings of course.  I reboot after 30 minutes and go into the BIOS to see what's going on and find the same.  I remove the charger plug several times, see that it registers, and observe that the battery health screen says that it's charging normally and the battery info screen says "Idle" @ 8% charged.  I load up Vista again and now have it at 8% charge (hovers around 7-8%) and not charging.  Sometimes I can wiggle and twist the connector in the socket and it will start charging for a second or more then stop again, the same in the BIOS.

I'm thinking that I have an issue with the power brick and the battery.What is going on?  What should I do?  What CAN I do?