07 used or 08 new... what to do....HELP>>>

I have been in the market for a prius for awhile now. I want to get a package 6 touring. I recently saw a used 07 package 5 touring with leather upgrade. The car has 10,500 miles on it.
The dealer will sell me this car for 24,500 dollars... when i took my car in for trade ( 2000 bmw 3 series with 200,000 miles, they offered me first 2000 then 4000 for trade )
my price for the 07 package 5 with leather seats and 10,500 miles will be 20,500 plus my trade(4000) in plus $180 dealer prep plus 5%tax.....
Is this a good deal or bad deal?

 

the package 5 with leather upgrade does not have leather wrapped steering wheel... will I be missing much by not getting that?

This dealer also said 2008 package 5 and package 6 touring models are so hard to find now that no dealer will discount them at all... he finally said he would discount the car 500 dollars my price quote for a brand new 2008 package 5 touring with discount is 29,500 plus 5%sales tax, plus 189 dealer prep.....

Is this a good deal?

I am so confused that i am considering just keeping my 8 year old bmw with 200,000 miles... ( it gets 25 mpg

 

Sorry about that...