The only change I would make to the Wrath of Khan uniform is to lose the movie-era captain rank pin (the only one available) and replace it with contemporary rank bars, arranged vertically instead of horizontally on the rank pin strip.
Either that or go with a TNG-era pip arrangement in a pattern similar to this:
A=hollow pip. B=solid pip. C=pip cluster surrounded by bars for admiral
A
Chief
B
Ensign
A
B
Lieutenant JG
B
B
Lieutenant
A
B B
Lieutenant Commander
B
B B
Commander
B B
B B
Captain
C
Rear Admiral Lower Half
C
C
Rear Admiral Upper Half
C
C C
Vice Admiral
C C
C C
Admiral
C
C C
C C
Fleet Admiral