downhillmaster

You should absolutely get a nicer new bike.
If you can afford it you certainly seem to have earned it based upon the miles you have been riding.
And you should immediately see a small gain based upon the better, lighter equipment.