Are there any museums or sites in England or Scotland honouring James Watt?

I'm travelling to the UK from Australia and wanted to visit a number of sites of scientific history.

One at the top of my list is James Watt. (inventor/perfector of Steam Engine - a fundamental part of the Industrial Revolution).

I understand there is a working Boulton and Watt engine at the museum of Scotland.

There appears to be a display of his life at museum in London.

There appears to be a steam engine in a restored mill in New Lanark.

The closest seems to be a display the London Museum of Water and steam.

But can you visit a museum with a display about his life and works?

My question is: Are there any museums or sites in England or Scotland honouring James Watt?