Improve the AMP for the buffer or vice versa?

Hi guys

I have designed an AMP, and also a buffer for test. But a large Cap is brought by the buffer, which is a problem and limits the BW.

I have come up with an idea, Ind peaking in the last stage of the AMP to overcome it. Thinking it for twice, I feel the direction is a little wrong, which is that I change my AMP(what I want to design) to adapt the buffer(just for the measurement). I am very confused of the buffer for measurement.

What do you think of my idea?

Any advice will be greatly appreciated!

Thanks in advance~~~