If you can save for a frame like the Tarmac, save more money and buy a whole new Tarmac. Now, you have 2 bikes. Really, if you can justify/rationalize a new frame, you can do the same for a new bike.
But if you are really set on an upgrade...get a new frame. You'll love the Tarmac!