LESS SMOKE, MORE POKE
Suggest Hodgdon Universal Clays for both; think of it as a modern Unique.
Clean-burning easy-metering accurate ballistic equivalent to Unique.
(The 'new' Unique is new for shotgun loads; still the same smoky crap in handguns.)
"all my ammo is mostly retired factory ammo"