This is pretty much how I've houseruled it, for the sake of simplicity and making sure the rogues turn doesn't last for 20 minutes. One of my favorite things about 4e is how its been set up so that everyone's turn takes about the same amount of time (via the removal of animal companions...