i have a build just like your original build and love it............

you could split the difference between your two options and use a hart #3 taper .............