Looking at prices and dealer inventory it would appear the market is slowing down. I'm glad you still have a build slot open, and hopefully it is still available if/when you sell the Makai.

I ordered my boat in October of 2021 and did not get a build slot until July of 2022 because the dealer didn't have the spot they sold me available anymore even though I signed a check the day of the demo. Anyway, it worked out that I was able to get into a 2023 instead of a 2022, but I had to go all summer without a boat as I didn't take delivery until early August.

Ordering and picking all the options was a very fun/stressful/exciting/nerveracking experience. But the boat turned out great. Good luck on whatever you decide. Keep us updated if you do upgrade.