I liked COMBANK and COMQUEST to prepare for the shelf (if you use COMATs). But UW prepares you very well for Level 2 material as well.
If you have the time take notes on questions on COMQUEST you got wrong so you can skim through it before your test.