I'd get on a regular schedule, "ignore" the boost of energy and try getting to sleep at the same time each night and getting up the same time each morning for a week and see if that doesn't become/feel more normal. One can't "fix" sleep, can't make it up or change one's pattern very quickly and shift workers who work nights and sleep days have much higher chances of major health problems caused by that, etc. Give a really good try to a regular schedule, like you would to another habit (at least a month) and see if how you feel about it changes too? I think it's like starting an exercise routine, at first it's really really hard and you don't like it, etc.