For better drivability, replace M1 with Weiand from craigslist?

Tune it and swap the intake.
I think your on the right track here.