I have 2004 3.0i, manual.
Redline 50/50 mix from Opie Oils as outlined above for me (about 1.6 litres in total if I remember correctly), you just keep filling until it's full. My mechanic used a big syringe device to refill. I did improve the shifting action so I would recommend.
Castrol Syntrax Longlife 75w-90 in the diff, it's a bit over a litres (about 1.2 litres I think) and again just keep going until it's full. Just annoying as you have to buy 2 bottles, about £16 a litre.
Definitely do both. Some people don't realise they might have a very, very slightly weeping diff, after several years of slow dripping the diff will be running low. Mine wasn't running low but it was black and stinky.