You can buy a 14.5 and pin and weld an extended compensator or purchase one already done. It will be the legal 16 inch length when pinned and welded into place and should fit your bayonet.
Send your upper to a place like ADCO and have then cut, thread and mount a extended compensator with a pin and weld for the legal 16 inch length. Same results as above.
You could do what some here have done and mount a piece of a cut A2 compensator the nut part behind a A2 compensator and pin and weld. It will achieve the length but to an untrained eye at a glance the weapon will appear normal. Really your just doing the same thing as a extended compensator except your not going to have longer flash slots your will have longer section of grooves where you would normally mount a BFA.
Will it look absolutely legit? No but it will be damn close.
BCM
If you get this and select the option for the permanently attached extended A2X ($45.00) you would be able to swap over all your Colt stuff (side sling mount, hand guards, etc) to this upper and be ready to rock and roll. I haven't tested the fit for a bayonet as far as diameter however with the back end of the A2X in the same position as the standard A2 I don't see why it would not work.
Other option is to purchase a Colt 6921 which is a M4 minus the auto sear, it has the same length barrel as the issued item. However you will have to pay your $200 to DOJ and wait for approval before you can take it home.