With the guy who you're crazy in love with (after years together), have great passion with, and while you maintain a good friendship... you have some minor personality incompatibilities that make you have to work a little harder at it sometimes to be considerate of the other person and make things work?
Well, there's the thing right there! If you are that good together in the friendship department, minor personality incompatibilities are just that...minor and it wouldn't be a cause of concern. I suppose it depends on what your terms of reference are insofar as "minor" is concerned - if they get in the way, they are no longer minor. At any rate, as far as I'm concerned, you've gotta have both the friendship and the fireworks or at some point you'll feel somehow deprived of a whole, well rounded relationship.