All In A Mouse's Night would be a better choice to be replaced, that way the EP as a whole would be more comical.
I already posted my revamped tracklist for W&W elsewhere, but here it is again:
Eleventh Earl Of Mar
One For The Vine
Blood On The Rooftops
Your Own Special Way
Inside And Out
"Unquiet Slumbers For The Sleepers... In That Quiet Earth"