I hear ya. Definitely do what makes ya happy.
I would never recommend JOD if you're only planning on upgrading once per year. That completely voids the awesomeness that is JOD. Promos aren't Tmo's deal. That's Apple not offering anything. This year alone, I've got a free Gear VR, free year of Netflix and a free Gear Fit2. Totally awesome.
You don't ever want to pay too much toward one device...you MUST use your 3 (min 2) upgrades per year, for JOD to work like it should. The reason is... you don't want put $300-$400 toward a single device... like if your only getting one iPhone per year. That completely defeats the purpose of JOD.
So yeah, you should absolutely quit it, if that's the case. As for no in-store JOD sales.... that's fine. It's a huge money loss for Tmo...and their in-store employees make commission. So, it's totally understandable they stopped in-store JOD upgrades. I prefer over the phone sales anyway.
I'm just thankful they haven't ended JOD all together. I'm an iPhone user, who also uses Androids. Because I love checking out new tech

JOD makes that possible.