battery and adapter for VGN-S2XP

I have an old VAIO VGN-S2XP which I use as a spare - the rest of the family use it for email and stuff when booting up the desktop is too much trouble. The battery is pretty far gone - end of life thing; gives me about 30 minutes at most; well overdue for replacement.

Today the adapter died, so now I need to get a replacement for that as well. Its a VGP-AC16V8. 16V, 4A.

Could you guys please suggest aftermarket replacements for these items? Perhaps a universal adapter might be better - I don't know how much longer this old laptop is going to last, so something nice and cheap, please.
http://cgi.ebay.in/SONY-VGP-AC16V8-...4?pt=LH_DefaultDomain_203&hash=item3a62a1f50c
http://cgi.ebay.in/Universal-Laptop...aultDomain_203&hash=item3a6a5ec927#vi-content

Battery model no. is VGP-BPS2 11.1V/4800mAh
I found something that says it is a direct replacement but has 4400mAh.
http://cgi.ebay.in/NEW-NOTEBOOK-BAT...4?pt=LH_DefaultDomain_203&hash=item3cb49723e4

 

can't say much for the battery but I bought this : Cooler Master SNA 95 95W Slim Notebook power Adapter | eBay and it works a treat. It says refurbished but it seems brand new. be careful with the battery, aftermarket batteries sometimes cause problems.

 

That one's 19V.

Thanks for the tip about the battery. I'm aware of that and am already preparing to recover the BIOS if necessary.