Tough call. The smartest thing you did was include the wife in the decision. Makes things go much smoother in the hobby.
Whirlwind is pure awesomeness. I never actively sought one ought and bought mine on a whim because it was similar to funhouse (my favorite childhood game). I ended up loving the theme, the depth, and the pretty much perfect layout. Lots of storms in Michigan, so it is fitting for me & even feels nostalgic, but I understand the bad association.
If you replace it, I would agree 100% to replace it with a comparable layout (something Pat Lawlor). That way, you can miss the game but not the gameplay.