Have you looked into the Singapore Intensive Practice books?