Need some advice on next upgrade option please. Current system NDX/NAC 202/NAPSC/HiCap (non DR)/NAP 200/PMC 2023. Not sure if next move should be XPS2 for the NDX or have the HiCap serviced and DR. Anyone been through similar upgrade path? I am looking for a significant improvement. Any thoughts?