It does seems like veneers or crowns could be the better option for what you described above. Veneers (either porcelain or composite) would be able to give you a more uniform shade and appearance for your teeth. Like what Dr Soo mentioned as well, if the tooth is heavily filled in the past, porcelain crowns might be a better choice. Between composite and porcelain veneers, porcelain has better color stability and is less likely to discolor with time
Teeth whitening might not be viable as the fillings done previously will not get bleached during the whitening procedure, does possibly resulting in more disparity in terms of color.
Hope this helps
Cheers!
Kenneth