There are some aftermarket heatsinks for either type of CPU which will take your YS Tech 80mm fan, such as some of the Swiftechs, Alphas or Thermalrights. Alpha PAL8045 for AMD, Alpha PAL8942 for Pentium4.
If you won't overclock, then consider using RDRAM on i850E, instead of the i845PE, if you end up using a Pentium4 system. It seems to unleash the P4's potential better than even the dual-channel-DDR setup does, barring overclocking, which you said you didn't plan on.
For AMD, it looks like nForce2 is the platform of choice for virtually any scenario, with some spectacular performance gains in SPEC benchmarks and noticable gains in many others, compared to other AMD chipsets such as KT333 and KT400. It supports every SocketA CPU made to date and probably will support every future SocketA CPU as well. Great onboard 5.1 sound too (provided the manufacturer is using the MCP-T southbridge, such as with the EPoX 8RDA+ and A7N8X-Deluxe).
As you have apparently seen, different CPUs have different strengths. The price gap between AMD and Intel has closed in a lot of performance points, with the exception of the $700 area, where Intel is going it alone with the 3.06GHz P4.
Afterthought: is your 2400+ not fast enough for you? Maybe you should pick up an nForce2 board, set it up with two or more identical sticks of RAM to enable the dual-DDR capability, and see if you like it. EPoX 8RDA+ is around $110-120 shipped, and I haven't heard any complaints about it not accepting big heatsinks.
Afterthought 2: got a good video card? That's where the gaming performance is going to be made or broken.