That is great that you had a better vet experience! I hope it continues because it always feels better to have a vet you feel you can trust.
Our Frank does great on Fromm's Salmon Tunalini! His coat looks great and has much less tear stains. Merrick also has some great grain-free foods, especially good varieties of canned if you are looking for wet. Fromm doesn't have as many wet varieties. Merrick also has some great grain-free treats. I know they have a couple of canned foods with salmon base, but I am not sure about what treats they have with salmon.