Personally, I'd be more likely to go with option (2). Or if I went with option (1), I'd swap the RD along with the cassette to avoid that long cage when I didn't need it.