You've got the bass management figured correctly (if it helps keep track of it for other configurations, I've got a bass management diagram on my firmware updates page). I'd recommend leave the mains small (60Hz crossover) and playing with "upsample" in stereo mode for CD listening. If you do decide to go with large, you'll probably want to avoid the "LFE+L/R" mode because you'll still get the extra bass you didn't like before.