There are always chances of argument, although some of your facts are wrong.
The Triwizard Tournament is not in Hogsmeade; they are simply having a rally there to spur on excitement for the challenges. On the day that you muggles happen to visit Hogsmeade, it just so happens that the Department of Magical Games and Sports has made the first challenge that day, and an entrance has been built connecting the village to the edge of the Forbidden Forest in the tent area for viewing (although we can assume that we've been confused as being champions rather than spectators, perhaps by a charm cast of an evil-doer).
The magical artifacts, statues, etc. have all been laid out for our easy access because magic can give us the illusion that we are in one space but really in another, which would explain the layout of the castle; we are in front of the Great Hall for one minute, but then we just happen to travel over to the portrait gallery. You are muggles, and magic affects you all quite easily.
I highly doubt that Poseidon's Fury will be replaced (it seems like expansion is being focused purely in the Arabian section), but I wouldn't argue that a tour of the Chamber of Secrets would work location-wise; remember than when we exit through the cliffs on Forbidden Journey, we have to travel across the Black Lake (with Hogsmeade to our right), so the location would actually work, I just don't think that we should be misled into travelling through there. Plus, the location is already in Forbidden Journey, so repetition isn't going to cut it.
Just some thoughts.