If you're still on a tight budget, trade in. You will never be able to get the pricing on individual componentry to make the upgrades worthwhile. You will get a better frame, and more bike for your money, by trading in. The manufacturers get the best prices on components because they buy in bulk.

If you can afford to keep your old bike as a 2nd bike & buy a new, better bike, more gooder. But you will decide your finances.