The data that went into the plots:

.007 data
.01 data (Pwave fits to 5 states)
.01 data (Pwave fits to 2 states)
.02 data

Plot based on Aida's suggestion:

Plot based on Jim's suggestion:

The fits used were:
5-state fits to all three smearings (local+1S+2S) for all Swave onia quantities (pi, ro). 5- or 2-state fits to all three smearings (local+1S+2S for the Pwave onia quantities (b1, a0, a1). The 2-state fits are shifted to the right. (Only up for the .01 lattice so far.)
6-state fits to the local smearing only for the heavy-light quantities (hlpi and hlro).
All errorbars are from 100 bootstraps with a binsize of 1. SVD cuts were 1e-15, and never took effect.