If you had a bare frame with no components, what would be your vision for this bike?
What you have now is a hodge podge of stuff that doesn't go together. What you are proposing is more of the same. If it was my bike I'd start over with parts that match.