Severe or recurrent Athletes foot can be very tough to treat as the topical medications are generally pretty useless and even when they do work the source (your tub/shoes/sweaty feet/gym) is usually constantly re-infecting the area.
So, assuming that you do have athletes foot I would suggest you do what you can to reduce the fungus around you in shoes/tub etc. Lysol the shoes, bleach the tub. Make sure your feet aren't always sweaty, if they are mention that and Ill suggest some stuff. Stay on top of that kind of stuff.
OTC antifungals are worst than topical rx antifungals which as I mentioned are generally quite useless as well
You also stated that you now may have some fungus in your nails. Know that this can take 9-12 months to resolve.
If you do have fungus, and you are a candidate for an oral (systemic) medication you need to see your family doctor or better yet a foot doctor.
http://alpinefootankle.com/ Is my regular suggestion for a foot doc.
------------------------
'17 BMW M3 Comp
'18 BMW X3 M40i