Simplify.  In the sober light of day the double adaptation was pretty pointless and just made things more complicated than they needed to be.  No need for a framework here, it's still just as flexible without the additional interface/adapter.