^ This. Also, I really think the tire upgrade is the biggest safety move you can make for the car. There was one time I was driving my ND on the stock...
For your situation, i've honestly spent way too much time obsessing over the exact specs of my Mav's interior lol. The stock cubbies are a great start...