awesome. went there 1.5 years ago....
the places where you listed are really only the good places to go.. tourist places.
bring a digicam.. so many things you'd want to take a picture of. I took alot of pictures when i went there.. brought my laptop also, so that I could store all my pics.
Bring lots of shorts/tshirts. very very hot. . especially at the wall... bring water too... long ways up the wall.. but totally worth every bit of energy.
go eat too... try out some of the local stuff.. pretty good.. one more thing.. don't go wandering by yourself.. might not come back with all your body parts.
have fun and have a safe trip.
"Science without religion is lame, religion without science is blind." - Albert Einstein