I have already bought the oem set...and they don't fit with the 2003.5 lip, without cutting it.
I have also bought a set of 4" and 4.5" fog lights from a local auto store, and they didn't look right, they look small and don't take up all the space in the hole.
I havnt looked at mine enough to tell for sure or not but, why cant you make some brackets to make them sit back a little further? Its not like they do anything anyway other than look good