🚨⚠️Madone upgrades HELP ASAP🚨⚠️

I’ve got the aero bars on my madone but I want to raise the setup. All of the stuff I’ve seen on the trek website looks like it for a speed concept and I’m not sure it would fit. I would love to hear if anyone knows/has anything I could find to rise the aero bars. I’ve attached a pic of my setup and the blueprint I used.

I also want to add either a hand bar bottle cage or a front hydration system. Any tips for that would be greatly appreciated!

Thanks