I'm still a bit confused

I've got 2009.5 with everything, including the Songs & Lessons and the video tutorials, except the Audiophile stuff.
I want to upgrade to the 2010 edition. Do I need to get the Everything Pak or the UltraPlus Pak? The difference between the 2 seems to be the Songs & Lessons and the Video Tutorial Paks; are they different / extras on the 2010 edition?
Also, I am confused re the bonus paks. For $25, I can get Bonus-20 Pak, but is this any different to what I already have? For example, is the "101 Jazz Guitar Phrases" (item 17 on the bonus-20 pak) different from the "101 Riffs - Jazz Guitar Phrases" that I already have?
Thanks for clarifying.
Cemil