Matty, thanks for the writeup. Answers lot of my questions. BTW you are not the first to do something dumb, I've spent the best part of my life--and some how survived.
Just wondering if this pump module (without the frame) would do the trick: eBay Bare Pump Might be worth spending a bit of time fiddling around getting it to fit?
Latest pics New pattern fuel pump Horrible fuel filter holder Not so horrible reconditioned filter holder Interestingly new filter is 30% lighter than old one. There is a little residual fuel but I wonder if the rest is crud? Cant be?