Back to the OP, I picked up a similar upgrade a couple months back. Shopped like you did. Parked my old brick (1994 Norco Nitro) I took the brick out last night. I couldn't believe the difference in the two bikes. It was huge, you will enjoy waiting and then pulling the trigger on a quality ride.

I now have a list of 4 must have manly items:

1. A very good mountain bike.

2. A Bobcat with trencher, back hoe and front blade attachments.

3. A good woman who lets me ride and buy stuff and understands that I have to spend time tuning the bike up and don't want to watch real housewives kinda stuff.

4. A place like Ray's for when the weather is crappy.

That's my list. Did I miss anything?