It'll fit, yes, but the muzzle would be below flush of the handguard. Your options, as they currently stand, are to roll with the tri-rail handguard, or, cut your standard barrel back to 12.5" to keep the basic handguard.
I want a shorter basic handguard too. It's still early in the game yet, time will tell.