As I'm preety new around here I hear a lot of good stuff about qtan and this proves it that he is a really a great guy!
But really unfortunate that your order got lost!

Maybe a Ducky Zero will do the trick for you?
I would also suggest a Poker 2 as many have it and are satisfied with it. I also talked to BlueBär who has the Poker 2 and likes it as well. Although I don't own a mechenical keyboard yet, I am starting to dream about having a Poker 2 myself or the GH60

if there'll be a v2 somewhere next year.
Hey, maybe a GH60/65/75 is something for you if you are interested in constructing one for yourself or ask someone to make it for you.
Cheers