Thanks everyone. As soon as I find some times I will double check changes in the formula over several past month to validate them. Current month NS spike (50$ GC at gamestop) will have to be adjusted accordingly (not a huge change as only two SKUs for few days but still...).
Next idea is to consider new bundles (preorder and first week/month of release) as promotional SKUs as well. We will see.
Switch is on a rollercoaster right now. But like you said, that will get flattened a bit. Can't wait to see what the final will look like and how well it will match NPD.
About the new bundles: if they are special SKU, I would support it, especially when it's known from the get-go that the numbers will be limited.