Cool I would definitely go with more initial advance and total 36 to 38 just turning it to 38 total may work wonders. so if you turn it to 24 that should give you 38 total.

Big enough cam you may want the timing to come in sooner it's a try and see from hear.