By all means explore, but keep the Modwright.
That way (1) you can compare in real time between the two sets of components, and (2) you can sell on the separates if they don't outdo the Modwright.
You can probably achieve better sound, but how much of an increment is very much up for grabs.