First of all you need a fuel petcock, the EFI has an outlet for an EFI fitting, check with
Zippers Performance they have some fittings that convert efi tanks to carb tanks.
As far as fit to the frame I don't believe any changes were made to the frame or mounting points for the fenders or tanks until 08 where they went to a 6 gal tank and throttle by wire system.
I'd check with a HD parts counter see if the PN for the 07 and the 04 are the same for a fender and tank, or, it should be in paint section of the HD parts catalog you get look under the custom paint section if it says a set would fit 04 to 07 you could presume that the new set would fit, once you fix the petcock issue.