I would take it to 4000 and try it at that surface before adding polish. In fact, my Buzzbomb is drilled almost identical to yours and I am going to try the 4000 surface tonight. I'll report back after I bowl tonight. So far I have only tried it in box finish (1000), and have gotten a poor reaction thus far.
Should be interesting to compare our results considering that the layout is so similar. I think mine has been over-flaring thus giving me a poor reaction. My PAP is 5 over 1/2 up, slightly different than yours.
For me, first things first: I will try a couple of different surfaces, but if they don't work, I'll try a new layout (if I don't sell it first).
--------------------
~SprayNpray
-formerly known as SawFreak
-official house hack