I was thinking about adding tuna to the mack cheese to have a kind of tuna pasta bake. I expect you could mix the cottage pie with tuna as well as it's quite like a savoury mash. Salmon I'd probably just do the same or add it to a big mixed salad. Sorry not very imaginative!