I'd say yes and do the TOR’s / Map now while the bikes still under warranty.
Then maybe at 5 - 10,000 mi I would then start thinking Cat Bypass , Ramair , TuneBoy Dyno and stick with the TOR’s . I have done the above mods on my R3T and have no passion or reason to change the TOR’s for higher...