I remember being at that exact same crossroad. Someone told me, part of enjoying the ride is being satisfied with the bike you have. I would have been ok with upgrades to my components but really happy with a brand new everything. I don't regret or second guess going new, maybe I would have riding my perfectly fine original bike. Go with what makes you not second guess.