Before you spray your waterborne, swipe over the shellac with an abrasive pad or 400+ paper to get rid of any nibs. Do the same after your first coat or two of the waterborne, too and be sure to thoroughly clean them after. You'll get a nice, smooth finish in the end that way by cleaning nibs after the first coats dry, capturing any raise in the finish.