Hey all. I know I'm sorta like the outcast around here because I have a Nighthawk and not the standard CB650

(Hey, at least I have the SOHC 4, right?) But I have a question for you all regarding the fuel tank JUST IN CASE someone has tried this before.
I took on my bike project in 2010 as a big ol' piece. Oil leaking everywhere, strong fuel smell, questionable brakes, etc. I rebuilt everything - yes everything. Every seal, gasket, filter, fluid - all done. I even repainted a custom color and all is good right? Well, a few months after all this is done I find that the fuel tank had pin holes. (Of course it was AFTER the paint was on.) Long story short, I've had two tanks on this thing and they both began leaking. I didn't even bother painting the last one because I was afraid it would start leaking. Good thing I didn't because just like the first one, pin holes on the low the side when on the kickstand. The first one was sealed after the fact by me with tank sealer and it's ok, but I want one that has no holes. The replacement that I bought ended up being worse than the first one. This bike is 100% without these damn fuel tanks.
These are hard tanks to find - it's a one year, one model tank. The replacements are all questionable to begin with and expensive - they don't look any more promising than the ones that I have. The 1983 Nighthawk model fuel tank looks similar - and I thought I've read where people have used those on the 82's but I'm not sure. I can't find it anywhere now. This would allow me to spend much less for a replacement, and have a larger pool to choose from. 1983 - 85 Nighthawks all used the same tank. Just wondering if anyone had done this before or knew about it. I can just buy one and try it, but I'd rather hear from a group to try and get some pointers first. The mounting points are in the same places, but I need to sit one on the frame to make sure it doesn't interfere with the fuse box or anything.
Thanks.