First of all, you should find which parasitic or secondary effect deteriorate your matching. Then you should consider that effect and re-design your circuit. besides based on your approach for layout, you can give better parasitic capacitance model to your simulator during pre-layout simulation. After another pre-layout simulation do post-layout simulation. You will find that your second post-layout simulation has better results. If you repeat this loop more , you will get very good results.