All of the above - except you might want to think about that leg-stretching "warm-up" hike the day before Whitney. While it sounds good in theory, it can come back to haunt you the next day. Ideally, the day before a big hike you want to rest.
I would strongly second Steve's suggestion of Mt. Dana the weekend before your Whitney hike. It's a significantly shorter hike than Whitney, but steeper and more rugged - if you can handle it and the altitude, you'll likely be fine for Whitney.
