If you are happy with your 7D invest your camera/lens budget to get better lenses. Don't let your friends spend your camera money for you, unless they are willing to sponsor your purchases. If you find yourself on the "Gotta get a new camera body treadmill" quickly have somebody unplug it.
If you have used EF-S lenses you will be amazed at the difference in the quality of the EF lens.
When and if you decide to upgrade to a full frame camera the EF lenses will be in your camera bag just dying to be used.

I'm not familiar with most of these lenses, they look to be mostly "kit" quality. I do own the 100mm Macro, and I love it. I also own the 7D, and love it. I would get better glass. You don't need to buy "L" to get quality. The canon 40mm f/2.8 is a great lens for $200. The 50mm f/1.4 is a fantastic lens for under $400. The 85mm f/1.8 is super, also under $400. The 300mm L f/4 IS is also great for under $1,500. The 400mm L f/5.6 is super for under $1,200.

You can get a whole lot of glass for $1,900. Are you a pro? Do you need a FF, or want a FF? You will gain some quality with a FF, but you can also gain quality from better glass. You might get 4-6 years out of a body, but you could get 20 out of a nice lens.

Also, not being familiar with these lenses, you may want to check if they are compatible with the 6D.