+1

To the OP I'm an amateur who "upgraded" from a Panasonic DMC-FZ30 through a Canon T2i and 7D to a 5DMKiii over a five year period. Knowing what I know now I would have gone straight to the 5DMKiii and saved some money. But the MKiii wasn't available when I bought the T2i and 7D. Like you I tend to shoot everything. A little macro here, some family event shots there, vacation shots which can be family and landscape, and just walking around places like Monterey/Carmel and shooting whatever interests me.

Going FF means a large investment even if you go for the 5DMKii or 6D. None of your EF-S lenses will work on a Canon FF and to get the best performance you will need "L" series lenses. That's not to say the other EF lenses won't do the job for you. It all depends on what you consider an acceptable level of IQ based on what you do with the photos you take.

AND NEVER PIXEL PEEP. It's a deadly sin that will cause you to want the most expensive lenses even though lesser lenses will do just fine for viewing on a monitor or printing up to 8x10.

Think about what you want most from you camera and read the reviews. Look at the EF and EF-S lenses that would suite your needs and not necessarily your wants unless you have a big budget. Perhaps just better glass would satisfy your needs. Or maybe the new 70D with some good glass would do the job. I love the EF-S 15-85 for a camera like yours or the 70D. A truly great walk around lens. But maybe you don't shoot the way I shoot.

Like the quote above says, only you can decide what will work best for you and fits your budget.