sure looks like you've got all the bases covered to me, and a good plan at that. I hope it didn't sound like I was steering you away from anything.
We've had good luck with the Pat Parrelli system of training, but it does take lots of time, which no one, including us, ever seems to have enough of.
That mare sounds great and coming into her prime. Hey, trail her out here, and we'll head up into the mountains!