'18 or '21 barrels will work.

Personally I've found repaired exhaust bridges tend to crack again very fast so if you're worried about it go for another pair of barrels.

As has been discussed in a couple of threads this week '18 barrels on a '16 are the way to go if you want improved performance.
_________________
If I have to take the carbs off once more...