I would remove main quest completely and add more fun stuff like jobs from fa2 examples:slaver,ranger,pornstar,boxer,caravan guard,gambler and many more...
Lets be honest main quest sucks and theres nothing that can make it right...iamb not even sure if theres point in fixing main quest...