Hmmm, I don't know that in most of these scenarios he'd shapechange (... dragon inside a haunted house, particularly awkward, there would be a lot of furniture destruction) if the goal is dragon form just because he's still trying to be a little bit careful.
Things I can potentially envisage to get around that:
i) We do a boat thing, Wangji capsizes them far out, Wrathion decides the number of undead vs them means water is a disaster and shapechanges to pluck Wangji out of the water before he tries to 1v1 everything in the water potentially including the mystery Man In White, and carries him back to the docks. DOCKS ARE VERY PRECARIOUS HOWEVER, he'd probably change eventually back so his bulk doesn't destroy rotten boards and send them crashing the fuck back in. ii) Spreading cure as an option. ... Jimmy had an idea about product placement on Dragon Bachelor. This is terrible, but it will make Wrathion think about other ways to get DRAGONS to have it en masse too. Technically, Wangji has pretended to be his rider before. Wangji trying to convince people this Health Tonic is good for dragons, see how shiny Wrathion's wings are? Feed it to all your dragons. We moderately have to assume a cure is created in some way for this, but if nothing gets finished we can assume it was v1 and idk didn't work. iii) Your Other Ideas Here.
no subject
Things I can potentially envisage to get around that:
i) We do a boat thing, Wangji capsizes them far out, Wrathion decides the number of undead vs them means water is a disaster and shapechanges to pluck Wangji out of the water before he tries to 1v1 everything in the water potentially including the mystery Man In White, and carries him back to the docks. DOCKS ARE VERY PRECARIOUS HOWEVER, he'd probably change eventually back so his bulk doesn't destroy rotten boards and send them crashing the fuck back in.
ii) Spreading cure as an option. ... Jimmy had an idea about product placement on Dragon Bachelor. This is terrible, but it will make Wrathion think about other ways to get DRAGONS to have it en masse too. Technically, Wangji has pretended to be his rider before. Wangji trying to convince people this Health Tonic is good for dragons, see how shiny Wrathion's wings are? Feed it to all your dragons. We moderately have to assume a cure is created in some way for this, but if nothing gets finished we can assume it was v1 and idk didn't work.
iii) Your Other Ideas Here.