Well done mate, glad you went through all those hard bits rather than just spending a couple of quid on new cables to start with
In seriousness, for a regular use bike, I'd be tempted to replace inners and outers every Spring, just using cheapish bog standard stuff.