Obviously I would invest in a new rig, but I want to make sure I'll make that money back or this will be a lost cause. I know it wouldn't come immediately, I calculated that if I ran a new rig with a new card it would mine back essentially it's worth in 6 months.
6 months is a pretty distant horizon. Did you account for changes in difficulty and probable negative market corrections?