First off, you state, "I will at some point in the very near future trade up to the 7D
for its faster frame rate and AF system," be aware that it's a trade up in terms of frame rate and AF vs. the 5DII, but a significant step down in terms of IQ and high ISO noise performance. For the things you commonly shoot (landscape, tabletop, some portraits, night photography, some architectural and a tad street), the 5DII is a much better choice. So, for birds I'd really consider adding
the 7D to your kit, rather than trading. The 5DII and 7D are an excellent combination (although IMO the 5DIII is really the best of both, in one body). I have similar interests as you, shoot many different subjects, birds amont them. For a couple of years, I shot with the 7D + 5DII combo, it works very well.
Honestly, the 7D + 100-400L is one of the best birding combos you can get in terms of price for performance. The AF and frame rate are great, you get a 400mm lens with very good IQ, and IS which is helpful for stationary birds, so you can shoot at ~1/200 s or so. If you look in my birds photostream (Flickr link
, while the latest shots are with a much more expensive setup (1D X + 600/4L IS II), most of them are with the 7D and 100-400mm. The 70-200mm f/2.8L IS II + 2x TC is similar in IQ, with better IS, but the cost of that setup apporaches the 7D+100-400, and the the 7D will be better for birds than the 5DII.
Bottom line, I'd recommend adding a 100mm Macro (the L verison if you can afford it) to round out your FF kit for the subjects you listed, then picking up a 7D + 100-400L for birds.