I totally agree with the man room idea. I have my "basement office", a bedroom turned computer and work area. No more gutted electronics on the dining room table.
It would be neat to find original boxes, that's true. But a nice cabinet or shelves would make a nice display for your Amigas.
Seems like you listen to her concerns. That's great. Any idea if she likes engagement rings? :-)
Hope it works out for ya!