I think one take away from your experience is NOT to get a guarantee cabin.
They usually use the least desirable cabins no one likes.
We used to get guarantees when we were younger to save money.
We usually wound up with...handicapped cabins, blocked views, over the anchor chain, etc.
We are older now & can afford to always pick are own.
As someone else said, it it wise to carry your own covid test kits whenever you travel nowadays.
And, cruising with a 1 year old can always be a bit problematic even before covid days. I do not think their immune systems are up to multitude of germs found on cruiseships.