Buckstix,
Your approach sounds logical.

Claydog,
I've checked about rehab for this affliction, but there is no cure. The following eases the pain a bit:
1. Buy Scottish guns and/or make ones that damn-well duplicate their quality and their lines.
2. Use above in the field regularly as symptoms persist.
3. Symptoms can be eased when no. 1 and 2 are combined with good friends who share in the affliction, good gun dogs, a harvested deer or a brace of birds, a bench full of files and piles of metal and wood shavings on the floor, a wee dram of Macallen or a pint of Milk Stout!