"With all the trouble"??? Beside
some of the Shield40s having the mag drop issue, what other trouble has there been?
If it's only for easy carry, go with the shield. The mag drop has been solved.
I wouldn't sell the C though until after getting the Shield and deciding you like the shield enough to actually carry it. You'd hate to wish you hadn't gotten rid of the C.
If you feel 7 or 8 rounds isn't enough, get comfy with the 'C'.
(BTW: There will never be a 'Once and for all'.