Congratulations! Our car history is similar: I drove an e36 M3 for many years before I was rear ended. Switched to an e91 for practical reasons and have just committed to purchasing a 2016 M235i with 21K miles. I really like the P3 gauge suggested but it's way too expensive.