You're almost there.
Here's couple of ways you could wire it, in both cases the neck volume push/pull selects the single pickup (down for Bridge and up for Neck), and the bridge volume push/pull selects between single pickup or both (down for single, up for both).
Jim's type of layout:
Same result, different way:
Hope that helps.