I hear you with the money problem. Which is why I still think that if the Cannondale is still working fine except for the gear issue than I would try to get that problem fixed and not get another bike.
I have both downtube and STI, I was raised on friction from the time I was 14 till now...I'm 61! So for me friction is great stuff. For younger people they think it's old thus not any good, but that's not true. Friction system is a lot cheaper and easier to fix than brifters!
If I understand you correctly you have a 9 speed rear gear cluster and you're trying to make it work with a 7 speed index shifter, if that is true the easy and cheap fix would be to convert the rear cluster back to a 7 speed plain and simple. There is no difference between first gear of a 7 speed or a 9 speed cluster, and there is no difference between the 7th gear and the 9th gear, the only difference between a 7 and a 9 is 2 more gears in between the first and last gear, gears I don't miss when I ride my 10 speed then jump on my old 5 speed!! Shimano still makes a 7 speed cluster so that can work. The other good news is that you're a also a good enough mechanic that you work on your own bike, so the conversion back to a 7 speed is simply going to cost you the parts which you can find online or at local bike shops (LBS) cheap starting at $20 and going up to around $35.
If you have money issues I would seriously consider getting your current bike in good working order. Cheap $400 bikes will run great for a couple of years, depending on how much you ride it, then after that issues start coming up and those issues will not be as cheap as problems you could have with your current bike.
It's just a suggestion.
But as far as which I bike if you decide to buy a new one, like I said before you chose because there is no real difference between the two. You could send an e-mail to Bikes Direct and ask them which of the two they would recommend but you have to be careful doing that because profit margin may be higher on one bike than the other and they may push that higher profit one, so when you ask them which bike also ask why they would recommend one over the other.