Finn and Miguel are so much alike. Finn does not like grobags either. 'No like it!' lol I tried one in England, I bought it ages ago, it's a toddler one and I now have to sell it because he doesn't like it.
I like the crib tent idea, that's cool.
Grants, with the way things have gone with M's sleep AND given that he's not finished teeth, I'd really do what you can to keep him in there. If there is no option you will have to set up his room with very minimal distractions, remove anything unsafe and try a gate at the door. In fact, I'd get a gate stat.