I can empathize with you to some extent. I miss my Z, and she's parked <50' from where I sleep at night. I stopped driving her as my daily in early December. She's been driven twice since for less than an hour total. I had some recent plumbing issues to deal with in the garage, so she's even sitting outside right now. But Texas weather is different than the NE, and she'll have her spot back as soon as I patch up the gyp board.
A new, kick-a
ss garage sounds like a good plan