Fillings replacement and whitening, in what order?

I have small fillings on my upper frontal teeths that needs to be replaced, but i also want to try to whiten my teeth a little bit.

Now, the problem is that teeths needs to be healthy before bleaching, but if i change filling and then whiten it i'll probably need to replace fillings again because they will not become whiter. One dentist said that i could try to whiten it before i replace fillings, but there's a risk of small cavity on those teeth to become worse. Other dentist said that i could try to replace the fillings with a slightly whiter color than that of teeths, and then try to bleach the teeths to become as fillings.

What would you think is the best solution?