Just to add some reference points for you on the koshirae, if you're doing it through Aoi, then it's probably Nosyudo, which generally does good work. I've had 5 koshirae done with them in the last 2 years; one daisho set with antique tosogu, one custom hand crafted shikomizue, and 2 katana koshirae with modern fittings.
The koshirae with modern fittings I commissioned in early 2024 cost me only 150,000 yen through Aoi for everything, which at that time was only about $1K USD, a bargain in my opinion. The whole koshirae took about 4 months to complete.
Then as 2024/5 went by and more gaijin were buying swords because of the low yen and commissioning koshirae with Nosyudo, the wait times stretched out to about a year, and the prices went up slightly. I eventually went direct with my commissions at Nosyudo, and Koji-san there was very easy to work with. He always threw in free matching sageo tied to the saya and a sword bag. The shikomizue they made for me is a work of art, with a hand scraped exterior and custom metal fittings with bonji characters and a locking mechanism.