Yup.
If your goal is 400 wheel, it's hard to get there with the 5.7 reliably. Once you consider the extras that you'll need to go through to get there, the upgrade to a better trim is worth it in the long run. Either reconsider your goal or do it right.