With Shiro back at the Castleship, Keith makes a choice