We play with #2 since a tumble is done as a part of movement, as with jumping and climbing. When climbing up 10ft and then walking on a flat surface after that, we don't make the character keep moving at the same climb speed. Same goes for tumbling, you only tumble past foes that are threatening...