Yes, done as described. Except for the capped brood, which I split evenly between the two, a couple frames each (didn't know better). The only uncapped brood I left behind was what was on the back of the frame with the eggs.
When I went in, the queen was in the upper box again, which surprised me. Both boxes were prety well populated, and so each seemed full when split. Hopefully full enough. After they got over their trauma, they resumed their regular activity, and were just as busy coming and going at the old hive as before. I'll see how it develops over the next few weeks; this is my most serious heavy-duty manipulation yet.