Hugh,
One thing I want to mention that may be a problem is the 6095 and 6105 as delivered only work on 1/2" glass. Both can be upgraded to 3/4" with changing the outside magnet holder (about $20 for the 6095 and $50 for the 6105). If it is more than 3/4", this is only possible with the 6105 and it costs $100 to upgrade to a magnet pair for 1" glass.
I think the best option if the magnets will work is B, and adding a wavebox would still be great, you could start with C as well and add a couple more pumps if needed.