IF it were me, i'd still keep the single headlight front and paint it at the same time just in case you wanted to change it at a later date.
This is what my intensions were with the HJ Sandman that i had as i prefer the twin headlight front.