I would say .. sober up first.. leave the 8 ***** alone for a few hours.. then see if they are still there... just busting.. what kind of wax do you use... I would do the zaino deal.. do you have the 7424 machine? I have OB too and it is a bitch to keep.. no doubt... but the zaino regimine really does wonders...
heres my last routine that took out all swirls and just gave the car a deep, rich black look mirror like finish...2 coats of Z-PC fusion (with the 7424 machine) , 1 coat Z1, 1 coat Z5, a coat of Z8 and one coat of Z2 followed by another Z8

Run ya bout 80 bucks for the waxes and 150 for the 7424 if you dont have one.. with OB though, I just see noway around it.. I love my other Nissan, a silver altima that if I wash it once a month it looks good... OB sucks to keep up!

Chris