35mm might be too wide for FF with products like you have showed.
Your 50mm on canon crop is equialent to 80mm on FF, so a Canon 85mm f/1.8 might make more sense. Or just keep your 50mm and see what you need.
The thing is you haven't said why you want to upgrade. What is the limitation of your current setup? What would ou like improved?
Product photography is very easy on cameras - you don't need good auto focus, you don't need good High ISO or DR, you dont need a rugged waterproof setup, you dont need built in vgrip, you don't need high speed.
I don't think you will see much difference in your output with a different camera. Sure the 6D images will have more detail when printed very large but that is rarely done 9except for billboards and the like).
If there is no compelling reason to change bodies I would stick with what you have and look at lenses. If you find the 50mm too long or too short then you can help whittle down the options. If you think the 50mm is just right then I wouldn't even both changing lenses.
I can't really help with flashes and i tend not to use them for product photography,. i have 3-4 500W lamps I diffuse through home made light boxes.