Seconded. It'd make a nice modern two-parter, I think? All the build-up and stuff in ep one, and then the trailers could be full of the Brig in an eye patch. Would work quite well.

(My main issue with older episodes is the pacing. So. Much. Padding.)