Yes, correct you can use noise on both roughness and bump....I will advise to use the mix node with your noise and then use it in roughness so you can control its overall effect on reflectivity. You can also turn down its effect from the maps section as well. It will take a bit trial and error to achieve what you are going for but overall this is the way. You can further use some layered shader to addsome subtle dirt, dust and grunge effect but if its a product shoot then you would not want to do this for a cleaner look so it all comes down what you want to achieve. :)