Would moving the 'spoiler' to the final hall be a big issue? Maybe locking the fisrt door behind the player after a certain time so the spoiler cant be avoided. Just my opinion but it's a bit unrealistic that 'spoiler' is immune all the traps anyway.