I think you should get a bike fit done on your current bike first as this could save you a lot of money. The difference in comfort after a profession fit is night and day and you could use the rest of your available money on wheels, or Di2 for example? Also once you have had a bike fit they should provide you with measurements that you can take to another bike for when you upgrade.