Improved performance and variation modelling for hierarchical-based optimisation of analogue integrated circuits