At the risk of repeating myself, I definitely think the 5DII is the best choice.

FWIW, it has C1-C3 modes like the 7D. As Rick stated, RAW is the way to go, meaning no need for a BW mode, you'd do that in post. But the modes are useful - e.g. I have C1 for basic tripod (ISO 100, f/8, 2-sec timer, mirror lockup).

My advice would be start with just the 24-105mm. You have time before you go to determine if you need/want wider or longer. If your P&S was the IXUS 750, that has a 37-111mm equivalent zoom - 24mm will be substantially wider than you're used to. That will also give you a chance to decide if/what prime you want - set the zoom to 35, 50, and 85mm for a while, and see what works best for you.