Modwright Oppo BDP-95 Solid State Mod versus NAD M51 with stock Oppo as transport...

I am thinking about upgrading my digital front end and I'm looking for advice from folks who may have heard an Oppo BDP-95 with Modwright's solid state mod as compared to the NAD M51.

I am pretty happy with the Oppo - it is well broken in and I'm powering it with a Shunyata Anaconda CX which really boosts the performance of the stock player.  I'm also using superb quality ICs from the Oppo to my Modwright SWL9.0SE preamp.  I am getting a very good 3D soundstage with lots of detail and not too much edge.  But my research tells me I could probably do better by either upgrading the Oppo or replacing it with the NAD M51.

I simply don't have the space for Modwright's well reviewed tube mod so I would have to do their 2-channel solid state mod - probably with the Bybee rails and Pulse Gen ZX.  My main concern with doing the SS mod is the absence of decent reviews, and so I worry I may not like the results for some reason.  And once the mod is done, it's done.

If I went the NAD route, I would use the Oppo as a transport to the NAD via HDMI so I could continue spinning my collection of SACDs.  I would move the power cable and ICs over to the NAD, put a decent $200 power cable on the Oppo, and splurge for a decent HDMI cable to go from the Oppo to the NAD.  I figure I could do all this for around the same price as the Oppo mod.

So what would be the advice of those in the know?  Any good advice would be appreciated.