Could you use the B1's and just not set them on kill? OU812 did a thread on some basically stock B1's (mild cleanup, valve job etc) that kept a reasonable port volume, but still flowed alot of air (380's?)that you wouldn't have to spin the day lights out of your 499 to make good power. That way when you get your aftermarket block you can set them on kill at that time.
