Tom, I agree that we should probably use the metadata when a simple connection string with no params is used. It is very likely that we missed the update of getWMSFeatureInfoURL() when we added the ability to setup a CONNECTIONTYPE WMS layer using metadata.
Setting milestone to 5.2... hoping one of us has time to take care of it.