I find tri-tip to be extraordinary when lightly seasoned and grilled like a thick steak (which it basically is) and contrarily, most are disapppointed with tri-tips done in the smokers.
Just a thought for your consideration...
plus it would eliminate one of your smoker timing issues if you use your grill for the tri-tip.
My 2 cents.