After Basjoos suggestion of moving the template forward and NeilBlanchard's suggestion to do some tuft testing to make sure the current shape was aerodynamic to continue the current shape, I believe this is more what I'll end up with.
Shouldn't be too hard right? ...