Hi Lance
I was addicted to both booze and pot - while I got a handle on my desire for booze relatively quickly, it took me much longer to stop desiring weed.
The bottom line is tho - thoughts are thoughts. I think to a large extent they are involuntary.
Wants are wants too - sometimes we have wants that are self destructive.
the important thing is not if we have them or not - but how we respond to them.
For the past tweo years you've responded well. There's no reason to think that has changed.
If you think you need to beef up your recovery a little, of course by all means do just that - but you're doing this recovery thing and you shouldn't doubt yourself about that
D