Oh noes, not another "help me choose a lens" thread!

Last year I bought a broken 85mm f/1.8 off of a lovely POTN member with the intention of getting it repaired. Since, I've realised that if I tot up the repair money and what I could possibly sell the lens for as it is (I reckon roughly £60-ish), I could buy myself a Sigma 30mm f/1.4. It'd be great for indoor shooting, which is something I've been doing a fair amount of lately, plus from what I've read, it'd out-do my poor ol' 50mm f/1.8. For the record, I currently shoot indoors stuff between the 50mm and a Sigma 17-70mm f/2.8-4.5 (with a 430EX when I can use it).
BUT...

...I have a bit of money stashed away for a rainy day, and I figure I could just about afford a Sigma 70-200mm f/2.8 Macro at £500. I'm currently stuck using a Sigma 55-200mm f/4-5.6, which while sharp-ish, just doesn't cut it at present. A fast telephoto is something I really want, be it now or later.
Here's the deciding factor: I really, really want to upgrade this/next year to full-frame, hence I'm leaning towards the 70-200. Am I better off thinking of the present or the future?
Opinions welcome!

