Long story short I am electing to go without surgery and treat with anti-inflammatory medicine as well as a joint supplement.
For a joint supplement, I can highly recommend (from personal experience with our previous Basenji, Maxx), Missing Link Plus. It's expensive at places like Petco and PetsMart, but you can find it much cheaper by doing an Internet search.