Makadi Safari's were very good and can do custom tours to Etosha, Watersberg Plateau, Skeleton Coast or Caprivi after the hunt.
https://www.makadi-safaris.com/Jack & Ellen OConner hunted with them a couple of times. That was a good enough reference for me but check anyway. Dieter usually goes to a couple of the Safari Club annual events: Dallas & Las Vegas and some others so you may be able to speak to him personally. They have several Rances and concessions so should be able to work you in.