Certainly the tube set that you have would permit closer focus with both the 40mm and the 50mm lens. Since the 50mm macro lens was designed with appropriate optical corrections for subject distances much closer than 10x FL, it would be more likely to yield the best result, than if trying do the same thing with a lens never specifically designed for abberation corrections at very close distances, nor corrected to do 'flat field' photography. However, there is a lot of non-scientific and non-precision super-close focus photography which can be done even with lenses never designed for such close distances!
Also, in this day and age, the term 'macro' has devolved from being 'high magnification' photography (1X - 10X) to simply 'fill the frame with a small object many times larger than my frame'...CLOSE UP photography!
So, once again the 'It depends...' reply to a photographic question is appropriate to ask of the person posing the question, "...which one would do macro better?"
As for 6D vs. 7D, the difference is simply the ability to capture 24mm x 36mm image area, vs. the 15mm x 22.5mm image area...the optical considerations are identical, the magnification factor is identical