Best HigherEnd Cruise that has a large focus on Scotland?

My husband is of Scottish heritage and I’m determined to find the most suitable cruise to allow for calls in ports including Edinburgh, Glasgow, Inverness area and beyond. Would ideally travel in August of 2018 or 2019 so we could incorporate in the military tattoo in Edinburgh either before, after or during if there’s an Edinburgh overnight. Really would love to hear from others on this. We love Oceania for the smaller vessels, great food and classy atmosphere. But we’re open minded. A smoke free environment is super important to both of us. Thanks in advance!

I don't know if she goes round the top of Scotland, but the Hebridean Princess is one of the most luxurious cruise ships at sea... she's been chartered twice by the Queen, and was given her insignia. Very expensive, small and beautiful. perhaps you could combine it with a couple of nights in Edinburgh?