JLSO5, tell us about your barrels. Are you happy with them, except for choke restriction? Do they shoot to the same POI? If you could wave a magic wand and have perfect interchangeable choke tubes would you be happy?
Our advice will vary depending on what you say. Basically, if you have bad barrels, you need a barrel smith such as Wilkinson, Allor or Eyster (his son and son-in-law have been doing the work for years). If you want fixed chokes, tell them what you want and they will give it to you. All can have choke tubes installed and them tweak each tube as required.
If you are happy with your barrels, all you need are choke tubes. Briley does a good job and you can depend on their tubes. I have no personnel experience with Stu Wright, but several shooters I know say their work and chokes are top notch.