Update - 6th grade principal just called, and all sounds very positive. He has no intention of discontinuing the 504. Instead gave me lots of ideas on how it could be better implemented!