Deefstes, FWIW, I think you are totally on the right track.
I'd also add that you don't really have to set aside dives to practice (unless you are lucky enough to have access to a pool). We often shore dive, and will do skills at the beginning of the dive, in 20 feet or so of water, and then go do our tour, ending the dive with an ascent on a bag, maybe with an air-share or something to make it lively. Incorporating some skills into each dive means you don't burn out on practice, but you do it more often.
Things like rescue scenarios are probably best practiced on a dedicated dive, simply because you want to stay shallow, and doing them over again involves a number of ascents.
I'd also add that you don't really have to set aside dives to practice (unless you are lucky enough to have access to a pool). We often shore dive, and will do skills at the beginning of the dive, in 20 feet or so of water, and then go do our tour, ending the dive with an ascent on a bag, maybe with an air-share or something to make it lively. Incorporating some skills into each dive means you don't burn out on practice, but you do it more often.
Things like rescue scenarios are probably best practiced on a dedicated dive, simply because you want to stay shallow, and doing them over again involves a number of ascents.