Of course you should upgrade!
I have gone exactly the same path that you now considering.
I started up with the 200 CD player and DSP5000 18bit`s , upgraded these to 24/96, and later on changed the player to a 500 unit and added a 518. When I decided to go for multichannel, I bought a 565Z3 and a DSP5000C and where very satisfied with my system. However when I swopped the 565 and the 518 to a G61R I realized that this was the greatest improvement in my system - ever.

Gin