Yes, it's a BBD.
I did try something new with the initial timing. I used to stick it at 10 deg, then backed it down to 8, but this time I advanced it until the engine started running rough, then backed it down a couple degrees. Ended up around 14 deg btdc. I have also been considering this is the culprit and I need to take it back down to 10. Engine seemed happy there otherwise.
