I'm having a heck of a time trying to make some "fixit" floppies.

Here's the scenario:
NetBSD-1.6.1 does not properly support my NCR-based SCSI card.
I am under the impression that NetBSD-current does, though.  Maybe.
Source-only upgrades of userland are problematic as build.sh bombs out.
I can compile a NetBSD-1.6.1 kernel, but I can't access my SCSI CD-ROM
as it is on the NCR SCSI card using the broken siop driver.  It
also seems to think my "we" ethernet card should be talking to the
10base2 media instead of 10baseT and I can't figure out how to get
it to talk UTP/10baseT (ifconfig gives an error if I specify either
as the media type, grr).

So basically before I do a binary-install of NetBSD-1.6.1, I want to
ensure that I'll be able to revert to where I am now.  I normally use
boot floppies for this purpose.  I've got a nifty script called mkflop
that makes three floppies for stand-alone use.  But there's problems.
For example, "reachover" compilation of installboot fails.  And
now, callbacks from libraries like libtelnet.a (e.g. to printsub)
fail because the printsub has been hidden by crunchide as so:
000080f4 T _$$hide$$ telnet.cro printsub

So, I'm frustrated and would appreciate suggestions.

Disclaimer: I had a copy of crunchgen/crunchide in /usr/local/bin
shadowing the real copies, which I've removed but they might have
tainted some of my work.  I've tried to clean up and re-do everything
but I'm not positive I've been completely successful.

PS: Is there any good way to clean up cruft after upgrading?  Ex:

$ ls -la /bin/red
-r-xr-xr-x  1 bin  bin  98304 Aug  1  1994 /bin/red