This is bikeforums, so of course we are going to say don't replace the bike, supplement it with a second bike. There will be days when you'll want to take the BMC and days when you'll ride the racing-ish bike. The ideal number of bikes to own is N+1 where N is the number you currently own.

You should definitely do something about your handlebars. It's hard to say which change would do the most good, but any change might suffice.

You should be prepared to fix a flat or walk. When I go more than two miles, I carry all the tools for the job. A spanner is not heavy.