An update: I went ahead and removed the 4 caps and rearranged the 4 resistors mentioned in the original post, and so far it seems to be a success (see attached image).
I can't test the new 1GHz bandwidth right now, but as far as I can tell removing those 4 caps should have done the deed. My scope now goes down to 200ps/div, whereas before it went down to 500ps/div I believe. So I *think* it's good, but I can't be sure until I get some signals through...eventually...
EDIT: For anyone needing an example of how badly optical distortion can get even when looking straight on at a lens, feel free to use my image